comparison noconfig.pri @ 2186:b483f46e53eb bqaudiostream

Add MediaFoundation flags; subrepo updates; boldly refuse to continue when a test fails
author Chris Cannam
date Thu, 17 Jan 2019 15:09:56 +0000
parents f474b3931217
children 92c493792eaf
comparison
equal deleted inserted replaced
2184:a889ccb50ec6 2186:b483f46e53eb
58 58
59 INCLUDEPATH += $$PWD/sv-dependency-builds/win32-mingw/include 59 INCLUDEPATH += $$PWD/sv-dependency-builds/win32-mingw/include
60 60
61 LIBS += -Lrelease -L$$PWD/sv-dependency-builds/win32-mingw/lib 61 LIBS += -Lrelease -L$$PWD/sv-dependency-builds/win32-mingw/lib
62 62
63 DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE 63 DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE HAVE_MEDIAFOUNDATION
64 64
65 QMAKE_CXXFLAGS_RELEASE += -ffast-math 65 QMAKE_CXXFLAGS_RELEASE += -ffast-math
66 66
67 # Don't have liblo 67 # Don't have liblo
68 DEFINES -= HAVE_LIBLO 68 DEFINES -= HAVE_LIBLO
69 LIBS -= -llo 69 LIBS -= -llo
70 70
71 LIBS += -lwinmm -lws2_32 71 LIBS += -lmfplat -lmfreadwrite -lmfuuid -lwinmm -lws2_32
72 } 72 }
73 73
74 win32-msvc* { 74 win32-msvc* {
75 75
76 # This config is actually used only for 64-bit Windows builds. 76 # This config is actually used only for 64-bit Windows builds.
89 CONFIG(release) { 89 CONFIG(release) {
90 LIBS += -Lrelease \ 90 LIBS += -Lrelease \
91 -L$$PWD/sv-dependency-builds/win64-msvc/lib 91 -L$$PWD/sv-dependency-builds/win64-msvc/lib
92 } 92 }
93 93
94 DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE 94 DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE HAVE_MEDIAFOUNDATION
95 95
96 QMAKE_CXXFLAGS_RELEASE += -fp:fast -gl 96 QMAKE_CXXFLAGS_RELEASE += -fp:fast -gl
97 QMAKE_LFLAGS_RELEASE += -ltcg 97 QMAKE_LFLAGS_RELEASE += -ltcg
98 98
99 # No Ogg/FLAC support in the sndfile build on this platform yet 99 # No Ogg/FLAC support in the sndfile build on this platform yet
105 105
106 # Don't have liblo 106 # Don't have liblo
107 DEFINES -= HAVE_LIBLO 107 DEFINES -= HAVE_LIBLO
108 LIBS -= -llo 108 LIBS -= -llo
109 109
110 LIBS += -ladvapi32 -lwinmm -lws2_32 110 LIBS += -lmfplat -lmfreadwrite -lmfuuid -ladvapi32 -lwinmm -lws2_32
111 } 111 }
112 112
113 macx* { 113 macx* {
114 114
115 # All Mac builds are 64-bit these days. 115 # All Mac builds are 64-bit these days.