Move to new bmusb, which moves header files into bmusb/bmusb/.

diff --git a/Makefile b/Makefile
index 6c3af7acfd8478b8e01be79bffc5e4b7d9d26f94..ece1391bfd139ce56c8340ef1eba95e97af7683c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,12 +2,15 @@ CXX=g++
 INSTALL=install
 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
 
+ifeq ($(EMBEDDED_BMUSB),yes)
+  CXXFLAGS += -Ibmusb/
+else
+  PKG_MODULES += bmusb
+endif
+
 # Qt objects
 OBJS=glwidget.o main.o mainwindow.o vumeter.o lrameter.o vu_common.o correlation_meter.o aboutdialog.o
 OBJS += glwidget.moc.o mainwindow.moc.o vumeter.moc.o lrameter.moc.o correlation_meter.moc.o aboutdialog.moc.o

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