comparison sv.pro @ 1150:5e6e1e074080 3.0-plus-imaf

Merge branches 3.0-integration and imaf_enc to 3.0-plus-imaf

 
 MY_LIBS = -Lsvapp -Lsvgui -Lsvcore -Lchecker -Ldataquay -L. \
           -lsvapp -lsvgui -lsvcore -lchecker -ldataquay -lbq
 
 linux* {
-MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic
+MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic -ldl
 }
 
 win* {
 MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Lchecker/release -Ldataquay/release $$MY_LIBS
 }
 
 LIBS = $$MY_LIBS $$LIBS
 
 win* {
+
 PRE_TARGETDEPS += svapp/release/libsvapp.a \
                   svgui/release/libsvgui.a \
                   svcore/release/libsvcore.a \
                   dataquay/release/libdataquay.a \
                   checker/release/libchecker.a

         vamp-plugin-sdk/vamp-hostsdk/PluginSummarisingAdapter.h \
         vamp-plugin-sdk/vamp-hostsdk/PluginWrapper.h \
         vamp-plugin-sdk/vamp-hostsdk/RealTime.h \
         vamp-plugin-sdk/src/vamp-hostsdk/Window.h \
         main/MainWindow.h \
+        main/IMAFencoder.h \
+        main/checkbox.h \
         main/NetworkPermissionTester.h \
         main/Surveyer.h \
         main/SVSplash.h \
         main/PreferencesDialog.h
 SOURCES +=  \

         vamp-plugin-sdk/src/vamp-hostsdk/RealTime.cpp \
         vamp-plugin-sdk/src/vamp-hostsdk/Files.cpp \
 	main/main.cpp \
         main/OSCHandler.cpp \
         main/MainWindow.cpp \
+        main/IMAFencoder.c \
+        main/imafdecoder.cpp \
         main/NetworkPermissionTester.cpp \
         main/Surveyer.cpp \
         main/SVSplash.cpp \
         main/PreferencesDialog.cpp