Rename ui_foo.ui to foo.ui; seemingly, it is more standard.

[nageru] / Makefile

diff --git a/Makefile b/Makefile
index 3cf454694a39bd44fd6e773e12f9697e17ac2207..d1cb650289a0aace45f95a853f74d2630f7dfd91 100644 (file)
--- 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/
 
@@ -62,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
 
@@ -90,7 +90,7 @@ 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
@@ -99,8 +99,8 @@ BM_OBJS = benchmark_audio_mixer.o $(AUDIO_MIXER_OBJS) flags.o metrics.o
 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 += libEGL.so libGLESv2.so
+CEF_RESOURCES += locales/en-US.pak
 ifneq ($(CEF_NO_ICUDTL),yes)
 CEF_RESOURCES += icudtl.dat
 endif
@@ -127,18 +127,10 @@ libEGL.so: $(CEF_LIB_DIR)/libEGL.so
        $(CEF_CP) $< $@
 libGLESv2.so: $(CEF_LIB_DIR)/libGLESv2.so
        $(CEF_CP) $< $@
-swiftshader/:
-       mkdir swiftshader/
-swiftshader/libEGL.so: | swiftshader/ $(CEF_LIB_DIR)/swiftshader/libEGL.so
-       $(CEF_CP) $(CEF_LIB_DIR)/swiftshader/libEGL.so $@
-swiftshader/libGLESv2.so: | swiftshader/ $(CEF_LIB_DIR)/swiftshader/libGLESv2.so
-       $(CEF_CP) $(CEF_LIB_DIR)/swiftshader/libGLESv2.so $@
 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