summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorTaybin Rutkin <taybin@taybin.com>2006-06-14 18:15:39 +0000
committerTaybin Rutkin <taybin@taybin.com>2006-06-14 18:15:39 +0000
commit2387ef8bfb49e60b233244580fd132d25c6dc3e3 (patch)
tree09883f8fa45584e775899dc4fb13970e70b07b45 /libs
parent3c092755b291611890bc5fb1547947554051b428 (diff)
Fix for building on macosx.
git-svn-id: svn://localhost/ardour2/trunk@585 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/libsndfile/SConscript7
-rw-r--r--libs/libsndfile/src/macbinary3.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/libs/libsndfile/SConscript b/libs/libsndfile/SConscript
index af8ae2b228..b7d35b9337 100644
--- a/libs/libsndfile/SConscript
+++ b/libs/libsndfile/SConscript
@@ -18,6 +18,13 @@ sndfile.Append(CCFLAGS = "-DVERSION=\\\"ardour-special\\\"")
sndfile.Append(PACKAGE = domain)
sndfile.Append(POTFILE = domain + '.pot')
+conf = Configure(sndfile)
+
+if conf.CheckCHeader('/System/Library/Frameworks/CoreServices.framework/Headers/CoreServices.h'):
+ sndfile.Append(LINKFLAGS = "-framework CoreServices")
+
+sndfile = conf.Finish()
+
libsndfile = sndfile.SharedLibrary('sndfile', sndfile_files)
sndfile_h = sndfile.Command('src/sndfile.h', ['src/sndfile.h.in'], 'cd libs/libsndfile && ./configure && cd -', ENV=os.environ)
diff --git a/libs/libsndfile/src/macbinary3.c b/libs/libsndfile/src/macbinary3.c
index 7cad1d1110..32a10593a4 100644
--- a/libs/libsndfile/src/macbinary3.c
+++ b/libs/libsndfile/src/macbinary3.c
@@ -27,7 +27,7 @@
#if (OS_IS_MACOSX == 1)
-#include <CoreServices.h>
+#include <CoreServices/CoreServices.h>
int
macbinary3_open (SF_PRIVATE *psf)