X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=663100b35657f195523f661d4eb1fe532eb2650e;hb=e5a0d3dfb676087bdcef4c82876234782e46604c;hp=f8707c2e2e1754059947bf4b4ee141826c2c6753;hpb=0f6b9c1c9395f27e10e9366c1571b45031789899;p=nageru

diff --git a/Makefile b/Makefile
index f8707c2..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/
 
@@ -12,21 +12,21 @@ CEF_DIR=
 
 # Release or Debug, depending on what CEF version you want to link to.
 # Optionally, the special value CEF_BUILD_TYPE=system assumes you can build and link
-# to CEF without any special flags except getting libraries from $(CEF_DIR),
-# get resources from $(CEF_RESOURCE_DIR), and symlink resources instead of
-# copying them in.
+# to CEF without any special flags, get the remaining libraries (libEGL.so,
+# natives_blob.bin, etc.) from $(CEF_LIB), get resources from $(CEF_RESOURCE_DIR),
+# and symlink resources instead of copying them in.
 CEF_BUILD_TYPE=Release
 ifneq ($(CEF_DIR),)
   CPPFLAGS += -DHAVE_CEF=1
   ifeq ($(CEF_BUILD_TYPE),system)
-    LDFLAGS += -L$(CEF_DIR) -Wl,-rpath,$(CEF_DIR)
+    EXTRA_CEF_LDFLAGS =
     CEF_LIB_DIR = $(CEF_DIR)
     CEF_RESOURCE_DIR = /usr/share/cef/Resources
     CEF_CP = ln -s
   else
     CEF_LIBS = $(CEF_DIR)/libcef_dll_wrapper/libcef_dll_wrapper.a
     CPPFLAGS += -I$(CEF_DIR) -I$(CEF_DIR)/include
-    LDFLAGS += -L$(CEF_DIR)/$(CEF_BUILD_TYPE) -Wl,-rpath,\$$ORIGIN
+    EXTRA_CEF_LDFLAGS = -L$(CEF_DIR)/$(CEF_BUILD_TYPE) -Wl,-rpath,\$$ORIGIN
     CEF_LIB_DIR = $(CEF_DIR)/$(CEF_BUILD_TYPE)
     CEF_RESOURCE_DIR = $(CEF_DIR)/Resources
     CEF_CP = cp -a
@@ -40,10 +40,10 @@ else
 endif
 LDLIBS=$(shell pkg-config --libs $(PKG_MODULES)) -pthread -lva -lva-drm -lva-x11 -lX11 -lavformat -lavcodec -lavutil -lswscale -lavresample -lzita-resampler -lasound -ldl -lqcustomplot
 ifneq ($(CEF_DIR),)
-  LDLIBS += -lcef
+  EXTRA_CEF_LDLIBS = -lcef
   ifeq ($(CEF_BUILD_TYPE),system)
     # Don't build this ourselves; just link to the system version.
-    LDLIBS += -lcef_dll_wrapper
+    EXTRA_CEF_LDLIBS += -lcef_dll_wrapper
   endif
 endif
 
@@ -97,20 +97,22 @@ BM_OBJS = benchmark_audio_mixer.o $(AUDIO_MIXER_OBJS) flags.o metrics.o
 	moc $< -o $@
 
 ifneq ($(CEF_DIR),)
-CEF_PREBUILT_LIBS=libcef.so
 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
+ifneq ($(CEF_BUILD_TYPE),system)
+CEF_RESOURCES += libcef.so
+endif
 endif
 
-all: nageru kaeru benchmark_audio_mixer $(CEF_PREBUILT_LIBS) $(CEF_RESOURCES)
+all: nageru kaeru benchmark_audio_mixer $(CEF_RESOURCES)
 
-nageru: $(OBJS) $(CEF_PREBUILT_LIBS)
-	$(CXX) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(CEF_LIBS)
+nageru: $(OBJS) $(CEF_LIBS)
+	$(CXX) -o $@ $^ $(LDFLAGS) $(EXTRA_CEF_LDFLAGS) $(LDLIBS) $(EXTRA_CEF_LDLIBS) $(CEF_LIBS)
 kaeru: $(KAERU_OBJS)
 	$(CXX) -o $@ $^ $(LDFLAGS) $(LDLIBS)
 benchmark_audio_mixer: $(BM_OBJS)
@@ -135,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
@@ -169,7 +169,7 @@ DEPS=$(OBJS:.o=.d) $(BM_OBJS:.o=.d) $(KAERU_OBJS:.o=.d)
 -include $(DEPS)
 
 clean:
-	$(RM) $(OBJS) $(BM_OBJS) $(KAERU_OBJS) $(DEPS) nageru kaeru benchmark_audio_mixer ui_aboutdialog.h ui_analyzer.h ui_mainwindow.h ui_display.h ui_about.h ui_audio_miniview.h ui_audio_expanded_view.h ui_input_mapping.h ui_midi_mapping.h chain-*.frag *.dot *.pb.cc *.pb.h $(OBJS_WITH_MOC:.o=.moc.cpp) ellipsis_label.moc.cpp clickable_label.moc.cpp $(CEF_LIBS) $(CEF_PREBUILT_LIBS) $(CEF_RESOURCES)
+	$(RM) $(OBJS) $(BM_OBJS) $(KAERU_OBJS) $(DEPS) nageru kaeru benchmark_audio_mixer ui_aboutdialog.h ui_analyzer.h ui_mainwindow.h ui_display.h ui_about.h ui_audio_miniview.h ui_audio_expanded_view.h ui_input_mapping.h ui_midi_mapping.h chain-*.frag *.dot *.pb.cc *.pb.h $(OBJS_WITH_MOC:.o=.moc.cpp) ellipsis_label.moc.cpp clickable_label.moc.cpp $(CEF_LIBS) $(CEF_RESOURCES)
 
 PREFIX=/usr/local
 install: install-cef