Mercurial > hg > tony
comparison noconfig.pri @ 587:2090dd9bfbc1
Windows build updates
author | Chris Cannam |
---|---|
date | Wed, 04 Sep 2019 17:34:28 +0100 |
parents | 4f79d96d8219 |
children | 83cda426a045 |
comparison
equal
deleted
inserted
replaced
586:1dfdbd017cf5 | 587:2090dd9bfbc1 |
---|---|
91 INCLUDEPATH += /Libraries/boost_1_69_0 $$PWD/../boost_1_69_0 | 91 INCLUDEPATH += /Libraries/boost_1_69_0 $$PWD/../boost_1_69_0 |
92 | 92 |
93 ## 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 |
94 # CONFIG(debug) { | 94 # CONFIG(debug) { |
95 # LIBS += -NODEFAULTLIB:MSVCRT -Ldebug \ | 95 # LIBS += -NODEFAULTLIB:MSVCRT -Ldebug \ |
96 # -L../tony/sv-dependency-builds/win64-msvc/lib/debug \ | 96 # -L$$PWD/sv-dependency-builds/win64-msvc/lib/debug \ |
97 # -L../tony/sv-dependency-builds/win64-msvc/lib | 97 # -L$$PWD/sv-dependency-builds/win64-msvc/lib |
98 # } | 98 # } |
99 CONFIG(release) { | 99 CONFIG(release) { |
100 LIBS += -NODEFAULTLIB:LIBCMT -Lrelease \ | 100 LIBS += -NODEFAULTLIB:LIBCMT -Lrelease \ |
101 -L$$PWD/sv-dependency-builds/win64-msvc/lib | 101 -L$$PWD/sv-dependency-builds/win64-msvc/lib |
102 } | 102 } |
103 | 103 |
104 DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE HAVE_MEDIAFOUNDATION | 104 DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE HAVE_MEDIAFOUNDATION |
105 | 105 |
106 QMAKE_CXXFLAGS_RELEASE += -fp:fast -gl | 106 QMAKE_CXXFLAGS_RELEASE += -fp:fast |
107 | 107 |
108 LIBS -= -lFLAC -lvorbis -lvorbisenc -lvorbisfile | 108 LIBS -= -lFLAC -lvorbis -lvorbisenc -lvorbisfile |
109 | 109 |
110 # These have different names | 110 # These have different names |
111 LIBS -= -lsord-0 -lserd-0 | 111 LIBS -= -lsord-0 -lserd-0 |
112 LIBS += -lsord -lserd | 112 LIBS += -lsord -lserd |