From: Carl Hetherington <cth@carlh.net>
Date: Sun, 6 Jun 2021 21:33:23 +0000 (+0200)
Subject: Fix paths for changes to environment.
X-Git-Tag: v2.15.155~25
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=6014c99b59acad4586ef033c2ba3500f866f64f2

Fix paths for changes to environment.
---

diff --git a/platform/osx/set_paths.sh b/platform/osx/set_paths.sh
index 0ac055798..91d67ba94 100644
--- a/platform/osx/set_paths.sh
+++ b/platform/osx/set_paths.sh
@@ -1,11 +1,11 @@
 base=$HOME/workspace
-env=$HOME/osx-environment
+env=$HOME/osx-environment/x86_64/10.10
 sdk=$HOME/SDK
 
-export CPPFLAGS= LDFLAGS="-L$base/lib -L$env/x86_64/lib -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
-export LINKFLAGS="-L$base/lib -L$env/x86_64/lib -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
+export CPPFLAGS= LDFLAGS="-L$base/lib -L$env/lib -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
+export LINKFLAGS="-L$base/lib -L$env/lib -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
 export MACOSX_DEPLOYMENT_TARGET=10.10
-export CXXFLAGS="-I$base/include -I$env/x86_64/include -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
-export CFLAGS="-I$base/include -I$env/x86_64/include -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
-export PATH=$env/x86_64/bin:$PATH
-export PKG_CONFIG_PATH=$env/x86_64/lib/pkgconfig:$base/lib/pkgconfig
+export CXXFLAGS="-I$base/include -I$env/include -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
+export CFLAGS="-I$base/include -I$env/include -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
+export PATH=$env/bin:$PATH
+export PKG_CONFIG_PATH=$env/lib/pkgconfig:$base/lib/pkgconfig