comparison sv.pro @ 1266:3ca6b4102407 msvc2015_64

Further MSVC build stuff. Committing this as-is because it's building and running now, but there's a lot to tidy up.
author Chris Cannam
date Wed, 19 Oct 2016 17:33:32 +0100
parents 65b8c009a9f2
children ba71dbc5ee8b
comparison
equal deleted inserted replaced
1265:1698dd941cbe 1266:3ca6b4102407
9 } 9 }
10 win32-msvc* { 10 win32-msvc* {
11 # We actually expect MSVC to be used only for 64-bit builds, 11 # We actually expect MSVC to be used only for 64-bit builds,
12 # though the qmake spec is still called win32-msvc* 12 # though the qmake spec is still called win32-msvc*
13 INCLUDEPATH += sv-dependency-builds/win64-msvc/include 13 INCLUDEPATH += sv-dependency-builds/win64-msvc/include
14 LIBS += -Lrelease -Lsv-dependency-builds/win64-msvc/lib 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 }
15 } 24 }
16 mac* { 25 mac* {
17 INCLUDEPATH += sv-dependency-builds/osx/include 26 INCLUDEPATH += sv-dependency-builds/osx/include
18 LIBS += -Lsv-dependency-builds/osx/lib 27 LIBS += -Lsv-dependency-builds/osx/lib
19 } 28 }
23 } 32 }
24 33
25 !exists(config.pri) { 34 !exists(config.pri) {
26 35
27 CONFIG += release 36 CONFIG += release
28 DEFINES += NDEBUG BUILD_RELEASE NO_TIMING 37 DEFINES += NDEBUG BUILD_RELEASE
38 DEFINES += NO_TIMING
29 39
30 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
31 41
32 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
33 43
71 81
72 linux* { 82 linux* {
73 MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic 83 MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic
74 } 84 }
75 85
76 win* { 86 ##??? how to set this appropriately for debug/release
87 win32*:CONFIG(debug) {
88 MY_LIBS = -Lsvapp/debug -Lsvgui/debug -Lsvcore/debug -Lchecker/debug -Ldataquay/debug $$MY_LIBS
89 }
90 win32*:CONFIG(release) {
77 MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Lchecker/release -Ldataquay/release $$MY_LIBS 91 MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Lchecker/release -Ldataquay/release $$MY_LIBS
78 } 92 }
79 93
80 LIBS = $$MY_LIBS $$LIBS 94 LIBS = $$MY_LIBS $$LIBS
81 95
82 win* { 96 win32-g++* {
83 PRE_TARGETDEPS += svapp/release/libsvapp.a \ 97 PRE_TARGETDEPS += svapp/release/libsvapp.a \
84 svgui/release/libsvgui.a \ 98 svgui/release/libsvgui.a \
85 svcore/release/libsvcore.a \ 99 svcore/release/libsvcore.a \
86 dataquay/release/libdataquay.a \ 100 dataquay/release/libdataquay.a \
87 checker/release/libchecker.a 101 checker/release/libchecker.a
90 PRE_TARGETDEPS += svapp/libsvapp.a \ 104 PRE_TARGETDEPS += svapp/libsvapp.a \
91 svgui/libsvgui.a \ 105 svgui/libsvgui.a \
92 svcore/libsvcore.a \ 106 svcore/libsvcore.a \
93 dataquay/libdataquay.a \ 107 dataquay/libdataquay.a \
94 checker/libchecker.a 108 checker/libchecker.a
109 }
110
111 win32-msvc*:CONFIG(debug) {
112 PRE_TARGETDEPS += svapp/debug/svapp.lib \
113 svgui/debug/svgui.lib \
114 svcore/debug/svcore.lib \
115 dataquay/debug/dataquay.lib \
116 checker/debug/checker.lib
117 }
118 win32-msvc*:CONFIG(release) {
119 PRE_TARGETDEPS += svapp/release/svapp.lib \
120 svgui/release/svgui.lib \
121 svcore/release/svcore.lib \
122 dataquay/release/dataquay.lib \
123 checker/release/checker.lib
95 } 124 }
96 125
97 RESOURCES += sonic-visualiser.qrc 126 RESOURCES += sonic-visualiser.qrc
98 127
99 HEADERS += \ 128 HEADERS += \