ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

loader: Rename the 32-bit loader in the build tree too when doing a Wow64 build.

This commit is contained in:
Alexandre Julliard 2010-03-29 17:53:30 +02:00
parent f69d0fa00d
commit 50c6ac8324
3 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -229,6 +229,7 @@ loader/wine-preloader
loader/wine.de.man loader/wine.de.man
loader/wine.fr.man loader/wine.fr.man
loader/wine.man loader/wine.man
loader/wine32
programs/Makeprog.rules programs/Makeprog.rules
programs/rpcss/epm.h programs/rpcss/epm.h
programs/rpcss/epm_s.c programs/rpcss/epm_s.c

5
loader/Makefile.in
View File

@ -13,6 +13,7 @@ EXTRA_BINARIES = @EXTRA_BINARIES@
PROGRAMS = \ PROGRAMS = \
wine \ wine \
wine32 \
wine-installed \ wine-installed \
wine-preloader wine-preloader
@ -27,7 +28,7 @@ INSTALLDIRS = \
$(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \ $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \
$(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext) $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)
all: wine wine-installed $(EXTRA_BINARIES) $(MANPAGES) all: $(MAIN_BINARY) wine-installed $(EXTRA_BINARIES) $(MANPAGES)
@MAKE_RULES@ @MAKE_RULES@
@ -37,7 +38,7 @@ LDEXECFLAGS = @LDEXECFLAGS@
wine-preloader: preloader.o Makefile.in wine-preloader: preloader.o Makefile.in
$(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c000000 preloader.o $(LIBPORT) $(LDFLAGS) $(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c000000 preloader.o $(LIBPORT) $(LDFLAGS)
wine: main.o Makefile.in $(MAIN_BINARY): main.o Makefile.in
$(CC) -o $@ $(LDEXECFLAGS) main.o $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_LOCAL) $(CC) -o $@ $(LDEXECFLAGS) main.o $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_LOCAL)
wine-installed: main.o Makefile.in wine-installed: main.o Makefile.in

25
tools/winewrapper
View File

@ -81,7 +81,14 @@ else
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
fi fi
WINELOADER="$topdir/loader/wine" if [ -x "$topdir/loader/wine" ]
then WINELOADER="$topdir/loader/wine"
elif [ -x "$topdir/loader/wine32" ]
then WINELOADER="$topdir/loader/wine32"
else
echo "$0: could not find the wine loader in $topdir"
exit 1
fi
export WINELOADER export WINELOADER
# any local settings ? # any local settings ?
@ -92,18 +99,4 @@ fi
# and run the application # and run the application
case "$0" in exec "$WINELOADER" "$@"
wine|*/wine)
exec "$WINELOADER" "$@"
;;
*/*)
[ -f "$0.exe.so" ] && exec "$WINELOADER" "$0.exe.so" "$@"
echo "$0: cannot find corresponding application"
exit 1
;;
*)
[ -f "$appdir/$0.exe.so" ] && exec "$WINELOADER" "$appdir/$0.exe.so" "$@"
echo "$0: cannot find corresponding application"
exit 1
;;
esac