Mercurial > hg > sonic-visualiser
comparison sv.pro @ 1268:ba71dbc5ee8b piper
Merge from branch 3.0-integration
author | Chris Cannam |
---|---|
date | Thu, 20 Oct 2016 11:19:34 +0100 |
parents | 72daacb203a6 3ca6b4102407 |
children | cbb241e91426 |
comparison
equal
deleted
inserted
replaced
1262:83ad03154d36 | 1268:ba71dbc5ee8b |
---|---|
6 win32-g++ { | 6 win32-g++ { |
7 INCLUDEPATH += sv-dependency-builds/win32-mingw/include | 7 INCLUDEPATH += sv-dependency-builds/win32-mingw/include |
8 LIBS += -Lrelease -Lsv-dependency-builds/win32-mingw/lib | 8 LIBS += -Lrelease -Lsv-dependency-builds/win32-mingw/lib |
9 } | 9 } |
10 win32-msvc* { | 10 win32-msvc* { |
11 INCLUDEPATH += sv-dependency-builds/win32-msvc/include | 11 # We actually expect MSVC to be used only for 64-bit builds, |
12 LIBS += -Lrelease -Lsv-dependency-builds/win32-msvc/lib | 12 # though the qmake spec is still called win32-msvc* |
13 INCLUDEPATH += sv-dependency-builds/win64-msvc/include | |
14 # bah, this is happening even if not debug build | |
15 # CONFIG(debug) { | |
16 # LIBS += -NODEFAULTLIB:MSVCRT -Ldebug \ | |
17 # -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib/debug \ | |
18 # -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib | |
19 # } | |
20 CONFIG(release) { | |
21 LIBS += -Lrelease \ | |
22 -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib | |
23 } | |
13 } | 24 } |
14 mac* { | 25 mac* { |
15 INCLUDEPATH += sv-dependency-builds/osx/include | 26 INCLUDEPATH += sv-dependency-builds/osx/include |
16 LIBS += -Lsv-dependency-builds/osx/lib | 27 LIBS += -Lsv-dependency-builds/osx/lib |
17 } | 28 } |
21 } | 32 } |
22 | 33 |
23 !exists(config.pri) { | 34 !exists(config.pri) { |
24 | 35 |
25 CONFIG += release | 36 CONFIG += release |
26 DEFINES += NDEBUG BUILD_RELEASE NO_TIMING | 37 DEFINES += NDEBUG BUILD_RELEASE |
38 DEFINES += NO_TIMING | |
27 | 39 |
28 DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_RUBBERBAND HAVE_DATAQUAY HAVE_LIBLO HAVE_MAD HAVE_ID3TAG HAVE_PORTAUDIO | 40 DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_RUBBERBAND HAVE_DATAQUAY HAVE_LIBLO HAVE_MAD HAVE_ID3TAG HAVE_PORTAUDIO |
29 | 41 |
30 LIBS += -lbz2 -lrubberband -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -lz -lsord-0 -lserd-0 -llo | 42 LIBS += -lbz2 -lrubberband -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -lz -lsord-0 -lserd-0 -llo |
31 | 43 |
32 win* { | 44 win* { |
33 DEFINES += _USE_MATH_DEFINES | 45 DEFINES += NOMINMAX _USE_MATH_DEFINES |
46 DEFINES -= HAVE_LIBLO | |
34 LIBS += -lwinmm -lws2_32 | 47 LIBS += -lwinmm -lws2_32 |
48 } | |
49 win32-msvc* { | |
50 LIBS -= -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -lsord-0 -lserd-0 -llo | |
51 LIBS += -lsord -lserd -ladvapi32 | |
35 } | 52 } |
36 macx* { | 53 macx* { |
37 DEFINES += HAVE_COREAUDIO | 54 DEFINES += HAVE_COREAUDIO |
38 LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate | 55 LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate |
39 } | 56 } |
66 | 83 |
67 linux* { | 84 linux* { |
68 MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic | 85 MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic |
69 } | 86 } |
70 | 87 |
71 win* { | 88 ##??? how to set this appropriately for debug/release |
89 win32*:CONFIG(debug) { | |
90 MY_LIBS = -Lsvapp/debug -Lsvgui/debug -Lsvcore/debug -Lchecker/debug -Ldataquay/debug $$MY_LIBS | |
91 } | |
92 win32*:CONFIG(release) { | |
72 MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Lchecker/release -Ldataquay/release $$MY_LIBS | 93 MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Lchecker/release -Ldataquay/release $$MY_LIBS |
73 } | 94 } |
74 | 95 |
75 LIBS = $$MY_LIBS $$LIBS | 96 LIBS = $$MY_LIBS $$LIBS |
76 | 97 |
77 win* { | 98 win32-g++* { |
78 PRE_TARGETDEPS += svapp/release/libsvapp.a \ | 99 PRE_TARGETDEPS += svapp/release/libsvapp.a \ |
79 svgui/release/libsvgui.a \ | 100 svgui/release/libsvgui.a \ |
80 svcore/release/libsvcore.a \ | 101 svcore/release/libsvcore.a \ |
81 dataquay/release/libdataquay.a \ | 102 dataquay/release/libdataquay.a \ |
82 checker/release/libchecker.a | 103 checker/release/libchecker.a |
85 PRE_TARGETDEPS += svapp/libsvapp.a \ | 106 PRE_TARGETDEPS += svapp/libsvapp.a \ |
86 svgui/libsvgui.a \ | 107 svgui/libsvgui.a \ |
87 svcore/libsvcore.a \ | 108 svcore/libsvcore.a \ |
88 dataquay/libdataquay.a \ | 109 dataquay/libdataquay.a \ |
89 checker/libchecker.a | 110 checker/libchecker.a |
111 } | |
112 | |
113 win32-msvc*:CONFIG(debug) { | |
114 PRE_TARGETDEPS += svapp/debug/svapp.lib \ | |
115 svgui/debug/svgui.lib \ | |
116 svcore/debug/svcore.lib \ | |
117 dataquay/debug/dataquay.lib \ | |
118 checker/debug/checker.lib | |
119 } | |
120 win32-msvc*:CONFIG(release) { | |
121 PRE_TARGETDEPS += svapp/release/svapp.lib \ | |
122 svgui/release/svgui.lib \ | |
123 svcore/release/svcore.lib \ | |
124 dataquay/release/dataquay.lib \ | |
125 checker/release/checker.lib | |
90 } | 126 } |
91 | 127 |
92 RESOURCES += sonic-visualiser.qrc | 128 RESOURCES += sonic-visualiser.qrc |
93 | 129 |
94 HEADERS += \ | 130 HEADERS += \ |