diff config.pri.in @ 1984:015416e3a298 import-audio-data

Merge from default branch
author Chris Cannam
date Tue, 04 Sep 2018 14:10:47 +0100
parents 810a0b8f5472
children 32718f05903d
line wrap: on
line diff
--- a/config.pri.in	Fri Jun 29 14:10:08 2018 +0100
+++ b/config.pri.in	Tue Sep 04 14:10:47 2018 +0100
@@ -13,6 +13,8 @@
 QMAKE_CXXFLAGS += @CXXFLAGS@
 QMAKE_LFLAGS += @LDFLAGS@
 
+CONFIG += @CXXSTANDARD@
+
 linux*:LIBS += -L$$PWD -lbase -lasound -ldl 
 
 macx*:DEFINES += HAVE_COREAUDIO
@@ -20,4 +22,6 @@
 
 LIBS += @LIBS@
 
-DEFINES += HAVE_PIPER HAVE_PLUGIN_CHECKER_HELPER
+linux*:LIBS -= -ljack
+
+DEFINES += HAVE_PIPER HAVE_PLUGIN_CHECKER_HELPER DYNAMIC_JACK