system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-06 04:11:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed winelauncher for new dll files layout.

Browse source
This commit is contained in:
Alexandre Julliard 2002-03-29 18:08:31 +00:00
parent e8f99472fb
commit 624f8e9ec7
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/Makefile.in
View file

@ -41,7 +41,7 @@ bin2res: bin2res.o
$(CC) $(CFLAGS) -o bin2res bin2res.o
winelauncher: winelauncher.in
sed -e 's,@bindir\@,$(bindir),g' -e 's,@libdir\@,$(libdir),g' $(SRCDIR)/winelauncher.in >$@ || $(RM) $@
sed -e 's,@bindir\@,$(bindir),g' -e 's,@libdir\@,$(libdir),g' -e 's,@dlldir\@,$(dlldir),g' $(SRCDIR)/winelauncher.in >$@ || $(RM) $@
install:: $(PROGRAMS) $(INSTALLSUBDIRS:%=%/__install__)
[ -d $(bindir) ] || $(MKDIR) $(bindir)

11
tools/winelauncher.in
View file

@ -37,7 +37,7 @@
WINEBIN=@bindir@
WINELIB=@libdir@
WINESERVER=
WINELIBDLLS=@libdir@
WINEDLLPATH=@dlldir@
#------------------------------------------------------------------------------
# Establish Color Scheme
@ -145,18 +145,19 @@ if [ -x $WINEBIN/server/wineserver ] ; then
WINESERVER=$WINEBIN/server/wineserver
fi
if [ -r $WINELIB/dlls/libntdll.so ] ; then
WINELIBDLLS=$WINELIB/dlls
if [ -r $WINELIB/dlls/ntdll.dll.so ] ; then
WINEDLLPATH=$WINELIB/dlls
fi
#------------------------------------------------------------------------------
# Okay, set the paths and move on.
#------------------------------------------------------------------------------
export LD_LIBRARY_PATH=$WINELIB:$WINELIBDLLS:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$WINELIB:$LD_LIBRARY_PATH
export PATH=$WINEBIN:$PATH
export WINEDLLPATH=$WINELIBDLLS
export WINELOADER=$WINEBIN/$WINE_BIN_NAME
export WINEDLLPATH
export WINESERVER
info_flag=~/.wine/.no_prelaunch_window_flag
debug_flag=~/.wine/.no_debug_window_flag