Mercurial > hg > sonic-visualiser
comparison noconfig.pri @ 1833:acb51ab8fb26 plugin-path-config
Merge from default branch
author | Chris Cannam |
---|---|
date | Fri, 25 May 2018 09:25:38 +0100 |
parents | 98bec50c3c2e |
children | fdcd956b5d32 |
comparison
equal
deleted
inserted
replaced
1826:b03652cd338f | 1833:acb51ab8fb26 |
---|---|
28 | 28 |
29 # Default set of libs for the above. Config sections below may update | 29 # Default set of libs for the above. Config sections below may update |
30 # these. | 30 # these. |
31 | 31 |
32 LIBS += \ | 32 LIBS += \ |
33 -lbase \ | |
33 -lbz2 \ | 34 -lbz2 \ |
34 -lrubberband \ | 35 -lrubberband \ |
35 -lfftw3 \ | 36 -lfftw3 \ |
36 -lfftw3f \ | 37 -lfftw3f \ |
37 -lsndfile \ | 38 -lsndfile \ |
54 | 55 |
55 win32-g++ { | 56 win32-g++ { |
56 | 57 |
57 # This config is currently used for 32-bit Windows builds. | 58 # This config is currently used for 32-bit Windows builds. |
58 | 59 |
59 INCLUDEPATH += sv-dependency-builds/win32-mingw/include | 60 INCLUDEPATH += $$PWD/sv-dependency-builds/win32-mingw/include |
60 | 61 |
61 LIBS += -Lrelease -Lsv-dependency-builds/win32-mingw/lib -L../sonic-visualiser/sv-dependency-builds/win32-mingw/lib | 62 LIBS += -Lrelease -L$$PWD/sv-dependency-builds/win32-mingw/lib |
62 | 63 |
63 DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE | 64 DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE |
64 | 65 |
65 QMAKE_CXXFLAGS_RELEASE += -ffast-math | 66 QMAKE_CXXFLAGS_RELEASE += -ffast-math |
66 | 67 |
76 # This config is actually used only for 64-bit Windows builds. | 77 # This config is actually used only for 64-bit Windows builds. |
77 # even though the qmake spec is still called win32-msvc*. If | 78 # even though the qmake spec is still called win32-msvc*. If |
78 # we want to do 32-bit builds with MSVC as well, then we'll | 79 # we want to do 32-bit builds with MSVC as well, then we'll |
79 # need to add a way to distinguish the two. | 80 # need to add a way to distinguish the two. |
80 | 81 |
81 INCLUDEPATH += sv-dependency-builds/win64-msvc/include | 82 INCLUDEPATH += $$PWD/sv-dependency-builds/win64-msvc/include |
82 | 83 |
83 ## This seems to be intruding even when we're supposed to be release | 84 ## This seems to be intruding even when we're supposed to be release |
84 # CONFIG(debug) { | 85 # CONFIG(debug) { |
85 # LIBS += -NODEFAULTLIB:MSVCRT -Ldebug \ | 86 # LIBS += -NODEFAULTLIB:MSVCRT -Ldebug \ |
86 # -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib/debug \ | 87 # -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib/debug \ |
87 # -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib | 88 # -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib |
88 # } | 89 # } |
89 CONFIG(release) { | 90 CONFIG(release) { |
90 LIBS += -Lrelease \ | 91 LIBS += -Lrelease \ |
91 -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib | 92 -L$$PWD/sv-dependency-builds/win64-msvc/lib |
92 } | 93 } |
93 | 94 |
94 DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE | 95 DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE |
95 | 96 |
96 QMAKE_CXXFLAGS_RELEASE += -fp:fast | 97 QMAKE_CXXFLAGS_RELEASE += -fp:fast |
111 | 112 |
112 macx* { | 113 macx* { |
113 | 114 |
114 # All Mac builds are 64-bit these days. | 115 # All Mac builds are 64-bit these days. |
115 | 116 |
116 INCLUDEPATH += sv-dependency-builds/osx/include | 117 INCLUDEPATH += $$PWD/sv-dependency-builds/osx/include |
117 LIBS += -Lsv-dependency-builds/osx/lib | 118 LIBS += -L$$PWD/sv-dependency-builds/osx/lib -L$$PWD |
118 | 119 |
119 QMAKE_CXXFLAGS_RELEASE += -O3 -ffast-math | 120 QMAKE_CXXFLAGS_RELEASE += -O3 -ffast-math |
120 | 121 |
121 DEFINES += HAVE_COREAUDIO HAVE_VDSP | 122 DEFINES += HAVE_COREAUDIO HAVE_VDSP |
122 LIBS += \ | 123 LIBS += \ |