Mercurial > hg > tony

changeset 121:f7b2978d1d65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use sv-dependency-builds on OS/X as well if no config.pri
author Chris Cannam
date Thu, 09 Jan 2014 09:18:38 +0000
parents 8ed567d30e34
children ae709c7deb87
files .hgsubstate platform-dataquay.pri tonyapp.pro
diffstat 3 files changed, 45 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Wed Jan 08 17:48:09 2014 +0000
+++ b/.hgsubstate	Thu Jan 09 09:18:38 2014 +0000
@@ -1,5 +1,5 @@
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
-3c5adc4a864fa75e5b1e67c260b77541aaa4f1f6 sv-dependency-builds
-65b75e23bbd5f36fcc1bbc9073bbc12bddd34a78 svapp
-fe4772d113863a1654531f025e58dcf68e44922b svcore
-def489f5ce92bc62d0b16af676566087248f219a svgui
+7c42c2fc4173ccadd234f0d711fb2c96059e8477 sv-dependency-builds
+e86596839f27750cff1ddd3ea2e3e2ed953b8ac7 svapp
+8e22795fe30bf9540103181d994a2e795a83d8c0 svcore
+c65826b5e980005bbecb3da5b8d2fc1d2f7c4195 svgui
--- a/platform-dataquay.pri	Wed Jan 08 17:48:09 2014 +0000
+++ b/platform-dataquay.pri	Thu Jan 09 09:18:38 2014 +0000
@@ -3,6 +3,21 @@
     include(./config.pri)
 }
 
+!exists(config.pri) {
+    win32-g++ {
+        INCLUDEPATH += sv-dependency-builds/win32-mingw/include
+        LIBS += -Lsv-dependency-builds/win32-mingw/lib
+    }
+    win32-msvc* {
+        INCLUDEPATH += sv-dependency-builds/win32-msvc/include
+        LIBS += -Lsv-dependency-builds/win32-msvc/lib
+    }
+    macx* {
+        INCLUDEPATH += sv-dependency-builds/osx/include
+        LIBS += -Lsv-dependency-builds/osx/lib
+    }
+}
+
 CONFIG += staticlib
 
 DEFINES -= USE_REDLAND
@@ -12,7 +27,3 @@
 DEFINES += USE_SORD
 # Libraries and paths should be added by config.pri
 
-win32-g++: {
-    INCLUDEPATH += ../sv-dependency-builds/win32-mingw/include
-    LIBS += -L../../sv-dependency-builds/win32-mingw/lib
-}
--- a/tonyapp.pro	Wed Jan 08 17:48:09 2014 +0000
+++ b/tonyapp.pro	Thu Jan 09 09:18:38 2014 +0000
@@ -1,22 +1,35 @@
 
 TEMPLATE = app
 
-win32-g++ {
-    INCLUDEPATH += sv-dependency-builds/win32-mingw/include
-    LIBS += -Lsv-dependency-builds/win32-mingw/lib
-}
-win32-msvc* {
-    INCLUDEPATH += sv-dependency-builds/win32-msvc/include
-    LIBS += -Lsv-dependency-builds/win32-msvc/lib
-}
-
 exists(config.pri) {
     include(config.pri)
 }
-win* {
-    !exists(config.pri) {
-        DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_RUBBERBAND HAVE_DATAQUAY HAVE_LIBLO HAVE_MAD HAVE_ID3TAG HAVE_PORTAUDIO_2_0
-        LIBS += -lbz2 -lrubberband -lvamp-hostsdk -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -llo -lz -lsord-0 -lserd-0 -lwinmm -lws2_32
+
+!exists(config.pri) {
+    win32-g++ {
+        INCLUDEPATH += sv-dependency-builds/win32-mingw/include
+        LIBS += -Lsv-dependency-builds/win32-mingw/lib
+    }
+    win32-msvc* {
+        INCLUDEPATH += sv-dependency-builds/win32-msvc/include
+        LIBS += -Lsv-dependency-builds/win32-msvc/lib
+    }
+    macx* {
+        INCLUDEPATH += sv-dependency-builds/osx/include
+        LIBS += -Lsv-dependency-builds/osx/lib
+    }
+
+    DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_RUBBERBAND HAVE_LIBLO HAVE_MAD HAVE_ID3TAG
+
+    LIBS += -lbz2 -lrubberband -lvamp-hostsdk -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lsamplerate -llo -lz -lsord-0 -lserd-0
+
+    win* {
+        DEFINES += HAVE_PORTAUDIO_2_0
+        LIBS += -lportaudio -lwinmm -lws2_32
+    }
+    macx* {
+        DEFINES += HAVE_COREAUDIO
+        LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices
     }
 }