[Traverso-commit] traverso/src base.pri traverso/traverso.pro tra...

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    07/05/03 19:43:32

Modified files:
        src            : base.pri 
        src/traverso   : traverso.pro 
        src/traverso/widgets: InfoWidgets.cpp 

Log message:
        Added fixes to make it compile on OSÂ X

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/base.pri?cvsroot=traverso&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/traverso.pro?cvsroot=traverso&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.21&r2=1.22

Patches:
Index: base.pri
===================================================================
RCS file: /sources/traverso/traverso/src/base.pri,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- base.pri    23 Apr 2007 11:56:52 -0000      1.26
+++ base.pri    3 May 2007 19:43:32 -0000       1.27
@@ -114,11 +114,14 @@
 macx {
        QMAKE_CXXFLAGS += $$system(pkg-config --cflags glib-2.0)
        
+       DEFINES += OSX_BUILD
+       DEFINES += PORTAUDIO_SUPPORT
        DEFINES -= ALSA_SUPPORT
-       
-       LIBS += -ljack
+       DEFINES -= JACK_SUPPORT
                
        QMAKE_LFLAGS_SONAME  = -Wl,-install_name,@executable_path/../Frameworks/
+
+       INCLUDEPATH += /usr/local/include/glib-2.0
 }
 
 win32 { 

Index: traverso/traverso.pro
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/traverso.pro,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- traverso/traverso.pro       2 May 2007 16:36:21 -0000       1.48
+++ traverso/traverso.pro       3 May 2007 19:43:32 -0000       1.49
@@ -157,6 +157,11 @@
     LIBS += $$system(pkg-config --libs glib-2.0)
 }
 
+macx{
+    contains(DEFINES, LV2_SUPPORT){
+        LIBS += -lraptor
+    }
+}
 
 win32{
     LIBS -= -lslv2 -lfftw3

Index: traverso/widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- traverso/widgets/InfoWidgets.cpp    2 May 2007 09:28:09 -0000       1.21
+++ traverso/widgets/InfoWidgets.cpp    3 May 2007 19:43:32 -0000       1.22
@@ -37,6 +37,9 @@
 
 #if defined (WIN_BUILD)
 #include <Windows.h>
+#elif defined (OSX_BUILD)
+#include <sys/param.h>
+#include <sys/mount.h>
 #else
 #include <sys/vfs.h>
 #endif