Added support for Darwin DYLD_LIBRARY_PATH.
This commit is contained in:
parent
80444dfe51
commit
a808f38c1e
|
@ -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
|
||||||
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
|
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
|
||||||
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" ]
|
||||||
|
|
Loading…
Reference in New Issue