Update bmusb to a version that does not need to be embedded.

diff --git a/Makefile b/Makefile
index 100df44c0d6b2e5927eaf269f955fcf8404e6fc5..6411702a69fa5e1d04864b88225592e7d5d82b98 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,10 @@
 CXX=g++
 INSTALL=install
-PKG_MODULES = Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions Qt5OpenGL libusb-1.0 movit lua52 libmicrohttpd epoxy x264
+EMBEDDED_BMUSB=no
+PKG_MODULES := Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions Qt5OpenGL libusb-1.0 movit lua52 libmicrohttpd epoxy x264
+ifeq ($(EMBEDDED_BMUSB),no)
+  PKG_MODULES += bmusb
+endif
 CXXFLAGS := -O2 -g -std=gnu++11 -Wall -Wno-deprecated-declarations -fPIC $(shell pkg-config --cflags $(PKG_MODULES)) -pthread -DMOVIT_SHADER_DIR=\"$(shell pkg-config --variable=shaderdir movit)\" -Idecklink/
 LDFLAGS=$(shell pkg-config --libs $(PKG_MODULES)) -lEGL -lGL -pthread -lva -lva-drm -lva-x11 -lX11 -lavformat -lavcodec -lavutil -lswscale -lavresample -lzita-resampler -lasound -ldl
 
@@ -9,7 +13,7 @@ OBJS=glwidget.o main.o mainwindow.o vumeter.o lrameter.o vu_common.o correlation
 OBJS += glwidget.moc.o mainwindow.moc.o vumeter.moc.o lrameter.moc.o correlation_meter.moc.o aboutdialog.moc.o
 
 # Mixer objects
-OBJS += mixer.o bmusb/bmusb.o bmusb/fake_capture.o pbo_frame_allocator.o context.o ref_counted_frame.o theme.o resampling_queue.o httpd.o ebu_r128_proc.o flags.o image_input.o stereocompressor.o filter.o alsa_output.o correlation_measurer.o
+OBJS += mixer.o pbo_frame_allocator.o context.o ref_counted_frame.o theme.o resampling_queue.o httpd.o ebu_r128_proc.o flags.o image_input.o stereocompressor.o filter.o alsa_output.o correlation_measurer.o
 
 # Streaming and encoding objects
 OBJS += quicksync_encoder.o x264_encoder.o x264_speed_control.o video_encoder.o metacube2.o mux.o audio_encoder.o
@@ -17,6 +21,11 @@ OBJS += quicksync_encoder.o x264_encoder.o x264_speed_control.o video_encoder.o
 # DeckLink
 OBJS += decklink_capture.o decklink/DeckLinkAPIDispatch.o
 
+# bmusb
+ifeq ($(EMBEDDED_BMUSB),yes)
+  OBJS += bmusb/bmusb.o bmusb/fake_capture.o
+endif
+
 %.o: %.cpp
        $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
 %.o: %.cc
@@ -31,7 +40,7 @@ OBJS += decklink_capture.o decklink/DeckLinkAPIDispatch.o
 all: nageru
 
 nageru: $(OBJS)
-       $(CXX) $(LDFLAGS) -o $@ $^
+       $(CXX) -o $@ $^ $(LDFLAGS)
 
 mainwindow.o: mainwindow.cpp ui_mainwindow.h ui_display.h
 

diff --git a/bmusb b/bmusb
index 96c41434726ef4b603f58cc3cafbb1630bea269e..c9b69bb5d130dbb707939c714c8bbe1d41c1153c 160000 (submodule)
--- a/bmusb
+++ b/bmusb
@@ -1 +1 @@
-Subproject commit 96c41434726ef4b603f58cc3cafbb1630bea269e
+Subproject commit c9b69bb5d130dbb707939c714c8bbe1d41c1153c