Mercurial > hg > tony

comparison noconfig.pri @ 555:00aa19d02510

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
OK, switch back to assuming system installation of Boost headers for pYin
author Chris Cannam
date Sun, 17 Feb 2019 10:04:28 +0000
parents 702a70e48ca9
children 77754355b37a
comparison
equal deleted inserted replaced
554:80868290cfd9 555:00aa19d02510
60 60
61 # This config is currently used for 32-bit Windows builds. 61 # This config is currently used for 32-bit Windows builds.
62 62
63 INCLUDEPATH += $$PWD/sv-dependency-builds/win32-mingw/include $$PWD/sv-dependency-builds/win32-mingw/include/opus 63 INCLUDEPATH += $$PWD/sv-dependency-builds/win32-mingw/include $$PWD/sv-dependency-builds/win32-mingw/include/opus
64 64
65 INCLUDEPATH += /Libraries/boost_1_69_0 $$PWD/../boost_1_69_0
66
65 LIBS += -Lrelease -L$$PWD/sv-dependency-builds/win32-mingw/lib 67 LIBS += -Lrelease -L$$PWD/sv-dependency-builds/win32-mingw/lib
66 68
67 DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE 69 DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE
68 70
69 QMAKE_CXXFLAGS_RELEASE += -ffast-math 71 QMAKE_CXXFLAGS_RELEASE += -ffast-math
83 # even though the qmake spec is still called win32-msvc*. If 85 # even though the qmake spec is still called win32-msvc*. If
84 # we want to do 32-bit builds with MSVC as well, then we'll 86 # we want to do 32-bit builds with MSVC as well, then we'll
85 # need to add a way to distinguish the two. 87 # need to add a way to distinguish the two.
86 88
87 INCLUDEPATH += $$PWD/sv-dependency-builds/win64-msvc/include $$PWD/sv-dependency-builds/win64-msvc/include/opus 89 INCLUDEPATH += $$PWD/sv-dependency-builds/win64-msvc/include $$PWD/sv-dependency-builds/win64-msvc/include/opus
90
91 INCLUDEPATH += /Libraries/boost_1_69_0 $$PWD/../boost_1_69_0
88 92
89 ## This seems to be intruding even when we're supposed to be release 93 ## This seems to be intruding even when we're supposed to be release
90 # CONFIG(debug) { 94 # CONFIG(debug) {
91 # LIBS += -NODEFAULTLIB:MSVCRT -Ldebug \ 95 # LIBS += -NODEFAULTLIB:MSVCRT -Ldebug \
92 # -L../tony/sv-dependency-builds/win64-msvc/lib/debug \ 96 # -L../tony/sv-dependency-builds/win64-msvc/lib/debug \