Mercurial > hg > sonic-visualiser

comparison sv.pro @ 677:bfd68cc71a25 imaf_enc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch, fix build
author Chris Cannam
date Thu, 05 Dec 2013 10:57:51 +0000
parents e3a4831f9c64 87161aaa8097
children ddfa8ce5bc2d
comparison
equal deleted inserted replaced
676:dabe6e994a9c 677:bfd68cc71a25
58 svgui/svgui.lib \ 58 svgui/svgui.lib \
59 svcore/svcore.lib \ 59 svcore/svcore.lib \
60 dataquay/dataquay.lib 60 dataquay/dataquay.lib
61 } 61 }
62 !win* { 62 !win* {
63 #PRE_TARGETDEPS += svapp/libsvapp.a \ 63 PRE_TARGETDEPS += svapp/libsvapp.a \
64 # svgui/libsvgui.a \ 64 svgui/libsvgui.a \
65 # svcore/libsvcore.a \ 65 svcore/libsvcore.a \
66 # dataquay/libdataquay.a 66 dataquay/libdataquay.a
67 } 67 }
68 68
69 RESOURCES += sonic-visualiser.qrc 69 RESOURCES += sonic-visualiser.qrc
70 70
71 HEADERS += main/MainWindow.h \ 71 HEADERS += main/MainWindow.h \
72 main/PreferencesDialog.h \
73 main/IMAFencoder.h \ 72 main/IMAFencoder.h \
74 main/checkbox.h 73 main/checkbox.h \
74 main/NetworkPermissionTester.h \
75 main/Surveyer.h \
76 main/PreferencesDialog.h
77
75 SOURCES += main/main.cpp \ 78 SOURCES += main/main.cpp \
76 main/OSCHandler.cpp \ 79 main/OSCHandler.cpp \
77 main/MainWindow.cpp \ 80 main/MainWindow.cpp \
78 main/PreferencesDialog.cpp \
79 main/IMAFencoder.c \ 81 main/IMAFencoder.c \
80 main/imafdecoder.cpp 82 main/imafdecoder.cpp \
83 main/NetworkPermissionTester.cpp \
84 main/Surveyer.cpp \
85 main/PreferencesDialog.cpp
81 86
82 # for mac integration 87 # for mac integration
83 QMAKE_INFO_PLIST = deploy/osx/Info.plist 88 QMAKE_INFO_PLIST = deploy/osx/Info.plist
84 89