changeset 339:f5a291b1f541 bqaudiostream

Win and Mac build tweaks
author Chris Cannam
date Thu, 31 Jan 2019 14:48:29 +0000
parents 4add4bf9c40e
children 14b635c1a14a
files noconfig.pri
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/noconfig.pri	Thu Jan 31 14:16:01 2019 +0000
+++ b/noconfig.pri	Thu Jan 31 14:48:29 2019 +0000
@@ -59,7 +59,9 @@
 
     QMAKE_CXXFLAGS_RELEASE += -ffast-math
     
-    LIBS += -lmfplat -lmfreadwrite -lmfuuid -lpropsys -lwinmm -lws2_32
+    # (We don't have MediaFoundation support, with this build sadly)
+    
+    LIBS += -lwinmm -lws2_32
 }
 
 win32-msvc* {
@@ -72,17 +74,17 @@
     INCLUDEPATH += $$PWD/sv-dependency-builds/win64-msvc/include $$PWD/sv-dependency-builds/win64-msvc/include/opus
 
     CONFIG(release) {
-        LIBS += -Lrelease \
+        LIBS += -NODEFAULTLIB:LIBCMT -Lrelease \
             -L$$PWD/sv-dependency-builds/win64-msvc/lib
     }
 
-    DEFINES += NOMINMAX _USE_MATH_DEFINES
+    DEFINES += NOMINMAX _USE_MATH_DEFINES HAVE_MEDIAFOUNDATION
 
     QMAKE_CXXFLAGS_RELEASE += -fp:fast -gl
     QMAKE_LFLAGS_RELEASE += -ltcg
 
     # No Ogg/FLAC support in the sndfile build on this platform yet
-    LIBS -= -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile
+    LIBS -= -lFLAC -lvorbis -lvorbisenc -lvorbisfile
 
     # These have different names
     LIBS -= -lsord-0 -lserd-0
@@ -99,6 +101,7 @@
     LIBS += -L$$PWD/sv-dependency-builds/osx/lib -L$$PWD
 
     QMAKE_CXXFLAGS_RELEASE += -O3 -ffast-math -flto
+    QMAKE_LFLAGS_RELEASE += -O3 -flto
 
     DEFINES += HAVE_COREAUDIO HAVE_VDSP
     LIBS += \