comparison tonyapp.pro @ 50:8b7383948381

Bring in latest build fixes etc from SV -- now builds with either Qt4 or Qt5

 TEMPLATE = app
 
 include(config.pri)
 
 CONFIG += qt thread warn_on stl rtti exceptions
-QT += network xml gui
+QT += network xml gui widgets
 
 TARGET = Tony
 linux*:TARGET = tony
 solaris*:TARGET = tony
 

 OBJECTS_DIR = o
 MOC_DIR = o
 
 contains(DEFINES, BUILD_STATIC):LIBS -= -ljack
 
-LIBS = -Lsvapp -Lsvgui -Lsvcore -lsvapp -lsvgui -lsvcore $$LIBS
+MY_LIBS = -Lsvapp -Lsvgui -Lsvcore -Ldataquay -lsvapp -lsvgui -lsvcore -ldataquay
+
+linux* {
+MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic
+}
+
+LIBS = $$MY_LIBS $$LIBS
 
 win* {
 PRE_TARGETDEPS += svapp/svapp.lib \
                   svgui/svgui.lib \
-                  svcore/svcore.lib
+                  svcore/svcore.lib \
+                  dataquay/dataquay.lib
 }
 !win* {
 PRE_TARGETDEPS += svapp/libsvapp.a \
                   svgui/libsvgui.a \
-                  svcore/libsvcore.a
+                  svcore/libsvcore.a \
+                  dataquay/libdataquay.a
 }
 
 RESOURCES += tony.qrc
 
 HEADERS += src/MainWindow.h \