Mercurial > hg > sonic-visualiser

changeset 2199:be656d45bda0 bqaudiostream

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Opus fix for win32
author Chris Cannam
date Wed, 30 Jan 2019 10:31:36 +0000
parents 1105789f9adc
children c3b1e27f6538
files noconfig.pri repoint-lock.json
diffstat 2 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/noconfig.pri	Fri Jan 25 13:49:59 2019 +0000
+++ b/noconfig.pri	Wed Jan 30 10:31:36 2019 +0000
@@ -1,8 +1,8 @@
 
 CONFIG += c++14
 
-#CONFIG += release
-CONFIG += debug
+CONFIG += release
+#CONFIG += debug
 
 PREFIX_PATH = /usr/local
 
@@ -59,19 +59,21 @@
 
     # This config is currently used for 32-bit Windows builds.
 
-    INCLUDEPATH += $$PWD/sv-dependency-builds/win32-mingw/include
+    INCLUDEPATH += $$PWD/sv-dependency-builds/win32-mingw/include $$PWD/sv-dependency-builds/win32-mingw/include/opus
 
     LIBS += -Lrelease -L$$PWD/sv-dependency-builds/win32-mingw/lib
 
-    DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE HAVE_MEDIAFOUNDATION
+    DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE
 
     QMAKE_CXXFLAGS_RELEASE += -ffast-math
 
     # Don't have liblo
     DEFINES -= HAVE_LIBLO
     LIBS -= -llo
+
+    # (We don't have MediaFoundation support either, with this build sadly)
     
-    LIBS += -lmfplat -lmfreadwrite -lmfuuid -lpropsys -lwinmm -lws2_32 
+    LIBS += -lwinmm -lws2_32 
 }
 
 win32-msvc* {
--- a/repoint-lock.json	Fri Jan 25 13:49:59 2019 +0000
+++ b/repoint-lock.json	Wed Jan 30 10:31:36 2019 +0000
@@ -46,7 +46,7 @@
       "pin": "6990f06c9f49"
     },
     "sv-dependency-builds": {
-      "pin": "7b5216b54e42"
+      "pin": "2f2b27544483"
     },
     "icons/scalable": {
       "pin": "1c8844bfa946"