X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=d1cb650289a0aace45f95a853f74d2630f7dfd91;hb=6ffaabac0a523617b686f40c154a25cb548cc561;hp=d1d2213949ed8d48adfc53adf4a08577b9365427;hpb=0ef085c7b35c569a63a459035777c400ab960875;p=nageru

diff --git a/Makefile b/Makefile
index d1d2213..d1cb650 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,24 @@ 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 -L$(CEF_DIR), and get resources from
-# $(CEF_RESOURCE_DIR).
+# 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,\$$ORIGIN
+    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
   endif
 endif
 
@@ -37,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
 
@@ -59,7 +62,7 @@ OBJS += chroma_subsampler.o v210_converter.o mixer.o basic_stats.o metrics.o pbo
 OBJS += quicksync_encoder.o x264_encoder.o x264_dynamic.o x264_speed_control.o video_encoder.o metacube2.o mux.o audio_encoder.o ffmpeg_raii.o ffmpeg_util.o json.pb.o
 
 # DeckLink
-OBJS += decklink_capture.o decklink_util.o decklink_output.o decklink/DeckLinkAPIDispatch.o
+OBJS += decklink_capture.o decklink_util.o decklink_output.o memcpy_interleaved.o decklink/DeckLinkAPIDispatch.o
 
 KAERU_OBJS = kaeru.o x264_encoder.o mux.o basic_stats.o metrics.o flags.o audio_encoder.o x264_speed_control.o print_latency.o x264_dynamic.o ffmpeg_raii.o ref_counted_frame.o ffmpeg_capture.o ffmpeg_util.o httpd.o json.pb.o metacube2.o
 
@@ -87,26 +90,29 @@ BM_OBJS = benchmark_audio_mixer.o $(AUDIO_MIXER_OBJS) flags.o metrics.o
 %.pb.cc %.pb.h : %.proto
 	$(PROTOC) --cpp_out=. $<
 
-%.h: %.ui
+ui_%.h: %.ui
 	uic $< -o $@
 
 %.moc.cpp: %.h
 	moc $< -o $@
 
 ifneq ($(CEF_DIR),)
-CEF_RESOURCES=libcef.so natives_blob.bin snapshot_blob.bin v8_context_snapshot.bin
+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 += libEGL.so libGLESv2.so
+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_RESOURCES)
 
 nageru: $(OBJS) $(CEF_LIBS)
-	$(CXX) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(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)
@@ -116,29 +122,21 @@ ifneq ($(CEF_DIR),)
 # A lot of these unfortunately have to be in the same directory as the binary;
 # some can be given paths, but not all.
 libcef.so: $(CEF_LIB_DIR)/libcef.so
-	cp -a $< $@
+	$(CEF_CP) $< $@
 libEGL.so: $(CEF_LIB_DIR)/libEGL.so
-	cp -a $< $@
+	$(CEF_CP) $< $@
 libGLESv2.so: $(CEF_LIB_DIR)/libGLESv2.so
-	cp -a $< $@
-swiftshader/:
-	mkdir swiftshader/
-swiftshader/libEGL.so: | swiftshader/ $(CEF_LIB_DIR)/swiftshader/libEGL.so
-	cp -a $(CEF_LIB_DIR)/swiftshader/libEGL.so $@
-swiftshader/libGLESv2.so: | swiftshader/ $(CEF_LIB_DIR)/swiftshader/libGLESv2.so
-	cp -a $(CEF_LIB_DIR)/swiftshader/libGLESv2.so $@
+	$(CEF_CP) $< $@
 locales/:
 	mkdir locales/
 locales/en-US.pak: | locales/ $(CEF_RESOURCE_DIR)/locales/en-US.pak
-	cp -a $(CEF_RESOURCE_DIR)/locales/en-US.pak $@
-locales/en-US.pak.info: | locales/ $(CEF_RESOURCE_DIR)/locales/en-US.pak.info
-	cp -a $(CEF_RESOURCE_DIR)/locales/en-US.pak.info $@
+	$(CEF_CP) $(CEF_RESOURCE_DIR)/locales/en-US.pak $@
 icudtl.dat: $(CEF_RESOURCE_DIR)/icudtl.dat
-	cp -a $< $@
+	$(CEF_CP) $< $@
 %.bin: $(CEF_LIB_DIR)/%.bin
-	cp -a $< $@
+	$(CEF_CP) $< $@
 %.pak: $(CEF_RESOURCE_DIR)/%.pak
-	cp -a $< $@
+	$(CEF_CP) $< $@
 endif
 
 # Extra dependencies that need to be generated.
@@ -165,7 +163,7 @@ DEPS=$(OBJS:.o=.d) $(BM_OBJS:.o=.d) $(KAERU_OBJS:.o=.d)
 -include $(DEPS)
 
 clean:
-	$(RM) $(OBJS) $(BM_OBJS) $(KAERU_OBJS) $(DEPS) nageru 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_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
@@ -179,10 +177,20 @@ install: install-cef
 	$(INSTALL) -m 644 -o root -g root akai_midimix.midimapping $(DESTDIR)$(PREFIX)/share/nageru/akai_midimix.midimapping
 
 ifneq ($(CEF_DIR),)
+  ifeq ($(CEF_BUILD_TYPE),system)
 install-cef:
 	for FILE in $(CEF_RESOURCES); do \
+		mkdir -p `dirname $(DESTDIR)$(PREFIX)/lib/nageru/$$FILE`; \
+		cp -a $$FILE $(DESTDIR)$(PREFIX)/lib/nageru/$$FILE; \
+	done
+
+  else
+install-cef:
+	for FILE in $(CEF_LIBS) $(CEF_RESOURCES); do \
 		$(INSTALL) -D -m 644 -o root -g root $$FILE $(DESTDIR)$(PREFIX)/lib/nageru/$$FILE; \
 	done
+
+  endif
 else
 install-cef:
 endif