Commit a808f38c authored by Alexandre Julliard's avatar Alexandre Julliard

Added support for Darwin DYLD_LIBRARY_PATH.

parent 80444dfe
......@@ -62,12 +62,25 @@ fi
topdir=`cd "$topdir" && pwd`
if [ -n "$LD_LIBRARY_PATH" ]
if [ "`uname -s`" = "Darwin" ]
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
LD_LIBRARY_PATH="$topdir/libs"
if [ -n "$LD_LIBRARY_PATH" ]
then
LD_LIBRARY_PATH="$topdir/libs:$LD_LIBRARY_PATH"
else
LD_LIBRARY_PATH="$topdir/libs"
fi
export LD_LIBRARY_PATH
fi
if [ -n "$WINEDLLPATH" ]
then
WINEDLLPATH="$topdir/dlls:$topdir/programs:$WINEDLLPATH"
......@@ -76,7 +89,7 @@ else
fi
WINESERVER="$topdir/server/wineserver"
WINELOADER="$topdir/loader/wine"
export LD_LIBRARY_PATH WINEDLLPATH WINESERVER WINELOADER
export WINEDLLPATH WINESERVER WINELOADER
# any local settings ?
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