ChangeSet ID: 21577 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard@winehq.org 2005/11/30 14:56:03
Modified files: tools : winewrapper
Log message: Added support for Darwin DYLD_LIBRARY_PATH.
Patch: http://cvs.winehq.org/patch.py?id=21577
Old revision New revision Changes Path 1.11 1.12 +17 -4 wine/tools/winewrapper
Index: wine/tools/winewrapper diff -u -p wine/tools/winewrapper:1.11 wine/tools/winewrapper:1.12 --- wine/tools/winewrapper:1.11 30 Nov 2005 20:56: 3 -0000 +++ wine/tools/winewrapper 30 Nov 2005 20:56: 3 -0000 @@ -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" ]