A few OS X build/script fixes.

diff --git a/platform/osx/waf b/platform/osx/waf
index 7423eb973080711ee03922b37eec011869cf800e..dda678542235f37df7af9165a81b02816d02d1c2 100755 (executable)
--- a/platform/osx/waf
+++ b/platform/osx/waf
@@ -2,10 +2,10 @@
 
 set -e
 
-ENV=/Users/carl/Environments/osx/10.8
-DEPS=/Users/carl/cdist
+ENV=/Users/carl/Environments/osx/64
+DEPS=/Users/carl/cdist/64
 
-export PKG_CONFIG_PATH=$DEPS/lib/pkgconfig:$ENV/lib/pkgconfig
+export PKG_CONFIG_PATH=$DEPS/lib/pkgconfig:$ENV/lib/pkgconfig:/usr/lib/pkgconfig
 export LINKFLAGS="-L$ENV/lib"
 export CXXFLAGS="-I$ENV/include"
 export PATH=$PATH:$ENV/bin

diff --git a/run/makedcp-osx b/run/makedcp-osx
index 1b95ecc5d076f3956c17b96f91c8496a95621e0d..03756f524e08055ecdf35623ddaf8490b8003019 100755 (executable)
--- a/run/makedcp-osx
+++ b/run/makedcp-osx
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:build/src/lib:build/src:/Users/carl/Environments/osx/10.8/lib
+export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:build/src/lib:build/src:/Users/carl/Environments/osx/64/lib
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args build/src/tools/makedcp "$@"

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 86146c1b1797fba6387aa9d4f4bdbdaa6714d68b..86b6574322076d0ad530a79291fdf215e5221841 100644 (file)
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -22,7 +22,7 @@
 #include "cross.h"
 #include "compose.hpp"
 #include "log.h"
-#ifdef DVDOMATIC_POSIX
+#ifdef DVDOMATIC_LINUX
 #include <unistd.h>
 #include <mntent.h>
 #endif
@@ -165,7 +165,7 @@ mount_info ()
 {
        list<pair<string, string> > m;
        
-#ifdef DVDOMATIC_POSIX 
+#ifdef DVDOMATIC_LINUX
        FILE* f = setmntent ("/etc/mtab", "r");
        if (!f) {
                return m;