diff options
| author | Michael Hutchinson <mhutchinson@novell.com> | 2009-07-07 05:33:15 +0400 |
|---|---|---|
| committer | Michael Hutchinson <mhutchinson@novell.com> | 2009-07-07 05:33:15 +0400 |
| commit | 548efc9fac8744b9f1d0864a13c4de14199af77b (patch) | |
| tree | 5772eb7edb39aece8df37da2239080304e52e12d /main/build | |
| parent | 0786eaafeef8a5dcd04295c1e3a508532bed57f9 (diff) | |
* main/build/MacOSX/mdtool:
* main/build/MacOSX/monodevelop: Add MD's own pkg-config to
PKG_CONFIG_PATHS. Add Moonlight SDK path -- assume it will be copied
into the .app manually.
svn path=/trunk/monodevelop/; revision=137476
Diffstat (limited to 'main/build')
| -rwxr-xr-x | main/build/MacOSX/mdtool | 7 | ||||
| -rwxr-xr-x | main/build/MacOSX/monodevelop | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/main/build/MacOSX/mdtool b/main/build/MacOSX/mdtool index fdac1ebeb6..bd37310137 100755 --- a/main/build/MacOSX/mdtool +++ b/main/build/MacOSX/mdtool @@ -9,6 +9,9 @@ export DYLD_FALLBACK_LIBRARY_PATH=$MONO_FRAMEWORK_PATH/lib:/lib:/usr/lib # $0 should contain the full path from the root i.e. /Applications/<folder>.app/Contents/MacOS/<script> EXE_PATH="${0%%/mdtool}/lib/monodevelop/bin/mdrun.exe" +PKG_CONFIG_PATH="${0%%/mdtool}/lib/pkgconfig:$PKG_CONFIG_PATH" +export PKG_CONFIG_PATH + # Work around a bug in 'exec' in older versions of macosx OSX_VERSION=$(uname -r | cut -f1 -d.) if [ $OSX_VERSION -lt 9 ]; then # If OSX version is 10.4 @@ -20,6 +23,10 @@ fi ### END MAC-SPECIFIC SETUP ### Beyond this, all is from the Linux mdtool.in. Only the values of EXE_PATH and MONO_EXEC differ +## Moonlight SDK +MOONLIGHT_2_SDK_PATH="${0%%mdtool}/lib/MoonSDK" +export MOONLIGHT_2_SDK_PATH + # NOTE: remove this for stable releases if [ -z "$MD_NO_DEBUG" ]; then _MONO_OPTIONS=${MONO_OPTIONS:---debug} diff --git a/main/build/MacOSX/monodevelop b/main/build/MacOSX/monodevelop index 2a39d70e1f..fecef55a98 100755 --- a/main/build/MacOSX/monodevelop +++ b/main/build/MacOSX/monodevelop @@ -9,6 +9,9 @@ export DYLD_FALLBACK_LIBRARY_PATH=$MONO_FRAMEWORK_PATH/lib:/lib:/usr/lib # $0 should contain the full path from the root i.e. /Applications/<folder>.app/Contents/MacOS/<script> EXE_PATH="${0%%/monodevelop}/lib/monodevelop/bin/MonoDevelop.exe" +PKG_CONFIG_PATH="${0%%/monodevelop}/lib/pkgconfig:$PKG_CONFIG_PATH" +export PKG_CONFIG_PATH + # Work around a bug in 'exec' in older versions of macosx OSX_VERSION=$(uname -r | cut -f1 -d.) if [ $OSX_VERSION -lt 9 ]; then # If OSX version is 10.4 @@ -47,6 +50,10 @@ fi _MD_REDIRECT_LOG="${MD_REDIRECT_LOG:-${XDG_CONFIG_HOME:-$HOME/.config}/MonoDevelop/log}" +## Moonlight SDK +MOONLIGHT_2_SDK_PATH="${0%%monodevelop}/lib/MoonSDK" +export MOONLIGHT_2_SDK_PATH + # NOTE: remove this for stable releases if [ -z "$MD_NO_DEBUG" ]; then _MONO_OPTIONS=${MONO_OPTIONS:---debug} |