Mac: Following 10.4 ppc libs availability, update cmake & scons default settings

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 602fec4b7598a5bea4f430c6f245e82759d3e017..a926b4867469276fd7aab7ab0cb5a3b396dbd29a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -437,7 +437,7 @@ IF(APPLE)
                IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
                        SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.x.i386)
                ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
-                       SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc)
+                       SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.0.0-powerpc)
                ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
        ENDIF(WITH_LIBS10.5)
        

diff --git a/config/darwin-config.py b/config/darwin-config.py
index beb8f0d3e5948bdd173e3e53767fb9b377bb2325..55cb5d6a253f3f715023cb99cf0e9330a9750cb9 100644 (file)
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -153,7 +153,7 @@ BF_JACK_INC = '${BF_JACK}/include/jack'
 BF_JACK_LIB = 'jack'
 BF_JACK_LIBPATH = '${BF_JACK}/lib'
 
-WITH_BF_SNDFILE = False
+WITH_BF_SNDFILE = True
 BF_SNDFILE = LIBDIR + '/sndfile'
 BF_SNDFILE_INC = '${BF_SNDFILE}/include'
 BF_SNDFILE_LIB = 'sndfile'
@@ -211,7 +211,7 @@ BF_BULLET = '#extern/bullet2/src'
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-WITH_BF_FFTW3 = False
+WITH_BF_FFTW3 = True
 BF_FFTW3 = LIBDIR + '/fftw3'
 BF_FFTW3_INC = '${BF_FFTW3}/include'
 BF_FFTW3_LIB = 'libfftw3'