X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=663100b35657f195523f661d4eb1fe532eb2650e;hb=e5a0d3dfb676087bdcef4c82876234782e46604c;hp=3cf454694a39bd44fd6e773e12f9697e17ac2207;hpb=9f07870db523d3de947f1f6f235070952f316562;p=nageru diff --git a/Makefile b/Makefile index 3cf4546..663100b 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ CXX=g++ PROTOC=protoc INSTALL=install EMBEDDED_BMUSB=no -PKG_MODULES := Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions Qt5OpenGL Qt5PrintSupport libusb-1.0 movit luajit libmicrohttpd epoxy x264 protobuf libpci +PKG_MODULES := Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions Qt5OpenGL Qt5PrintSupport libusb-1.0 movit luajit libmicrohttpd epoxy x264 protobuf CXXFLAGS ?= -O2 -g -Wall # Will be overridden by environment. CXXFLAGS += -std=gnu++11 -fPIC $(shell pkg-config --cflags $(PKG_MODULES)) -pthread -DMOVIT_SHADER_DIR=\"$(shell pkg-config --variable=shaderdir movit)\" -Idecklink/ @@ -100,7 +100,7 @@ ifneq ($(CEF_DIR),) CEF_RESOURCES = natives_blob.bin snapshot_blob.bin v8_context_snapshot.bin CEF_RESOURCES += cef.pak cef_100_percent.pak cef_200_percent.pak cef_extensions.pak devtools_resources.pak CEF_RESOURCES += libEGL.so libGLESv2.so swiftshader/libEGL.so swiftshader/libGLESv2.so -CEF_RESOURCES += locales/en-US.pak locales/en-US.pak.info +CEF_RESOURCES += locales/en-US.pak ifneq ($(CEF_NO_ICUDTL),yes) CEF_RESOURCES += icudtl.dat endif @@ -137,8 +137,6 @@ locales/: mkdir locales/ locales/en-US.pak: | locales/ $(CEF_RESOURCE_DIR)/locales/en-US.pak $(CEF_CP) $(CEF_RESOURCE_DIR)/locales/en-US.pak $@ -locales/en-US.pak.info: | locales/ $(CEF_RESOURCE_DIR)/locales/en-US.pak.info - $(CEF_CP) $(CEF_RESOURCE_DIR)/locales/en-US.pak.info $@ icudtl.dat: $(CEF_RESOURCE_DIR)/icudtl.dat $(CEF_CP) $< $@ %.bin: $(CEF_LIB_DIR)/%.bin