diff sv.pro @ 677:bfd68cc71a25 imaf_enc

Merge from default branch, fix build
author Chris Cannam
date Thu, 05 Dec 2013 10:57:51 +0000
parents e3a4831f9c64 87161aaa8097
children ddfa8ce5bc2d
line wrap: on
line diff
--- a/sv.pro	Thu Dec 05 10:11:17 2013 +0000
+++ b/sv.pro	Thu Dec 05 10:57:51 2013 +0000
@@ -60,24 +60,29 @@
                   dataquay/dataquay.lib
 }
 !win* {
-#PRE_TARGETDEPS += svapp/libsvapp.a \
-#                  svgui/libsvgui.a \
-#                  svcore/libsvcore.a \
-#                  dataquay/libdataquay.a
+PRE_TARGETDEPS += svapp/libsvapp.a \
+                  svgui/libsvgui.a \
+                  svcore/libsvcore.a \
+                  dataquay/libdataquay.a
 }
 
 RESOURCES += sonic-visualiser.qrc
 
 HEADERS += main/MainWindow.h \
-           main/PreferencesDialog.h \
            main/IMAFencoder.h \
-           main/checkbox.h
+           main/checkbox.h \
+           main/NetworkPermissionTester.h \
+           main/Surveyer.h \
+           main/PreferencesDialog.h
+
 SOURCES += main/main.cpp \
            main/OSCHandler.cpp \
            main/MainWindow.cpp \
-           main/PreferencesDialog.cpp \
            main/IMAFencoder.c \
-           main/imafdecoder.cpp
+           main/imafdecoder.cpp \
+           main/NetworkPermissionTester.cpp \
+           main/Surveyer.cpp \
+           main/PreferencesDialog.cpp 
 
 # for mac integration
 QMAKE_INFO_PLIST = deploy/osx/Info.plist