Commit a808f38c authored by Alexandre Julliard's avatar Alexandre Julliard

Added support for Darwin DYLD_LIBRARY_PATH.

parent 80444dfe
...@@ -62,12 +62,25 @@ fi ...@@ -62,12 +62,25 @@ fi
topdir=`cd "$topdir" && pwd` topdir=`cd "$topdir" && pwd`
if [ -n "$LD_LIBRARY_PATH" ] if [ "`uname -s`" = "Darwin" ]
then then
LD_LIBRARY_PATH="$topdir/libs:$LD_LIBRARY_PATH" if [ -n "$DYLD_LIBRARY_PATH" ]
then
DYLD_LIBRARY_PATH="$topdir/libs:$DYLD_LIBRARY_PATH"
else
DYLD_LIBRARY_PATH="$topdir/libs"
fi
export DYLD_LIBRARY_PATH
else else
if [ -n "$LD_LIBRARY_PATH" ]
then
LD_LIBRARY_PATH="$topdir/libs:$LD_LIBRARY_PATH"
else
LD_LIBRARY_PATH="$topdir/libs" LD_LIBRARY_PATH="$topdir/libs"
fi
export LD_LIBRARY_PATH
fi fi
if [ -n "$WINEDLLPATH" ] if [ -n "$WINEDLLPATH" ]
then then
WINEDLLPATH="$topdir/dlls:$topdir/programs:$WINEDLLPATH" WINEDLLPATH="$topdir/dlls:$topdir/programs:$WINEDLLPATH"
...@@ -76,7 +89,7 @@ else ...@@ -76,7 +89,7 @@ else
fi fi
WINESERVER="$topdir/server/wineserver" WINESERVER="$topdir/server/wineserver"
WINELOADER="$topdir/loader/wine" WINELOADER="$topdir/loader/wine"
export LD_LIBRARY_PATH WINEDLLPATH WINESERVER WINELOADER export WINEDLLPATH WINESERVER WINELOADER
# any local settings ? # any local settings ?
if [ -f "$topdir/.winewrapper" ] if [ -f "$topdir/.winewrapper" ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment