configure: Create a wine64 symlink in 64-bit build trees.

This commit is contained in:
Alexandre Julliard 2011-05-10 13:26:28 +02:00
parent 84fd1f5849
commit 4422d22cfe
5 changed files with 20 additions and 7 deletions

1
.gitignore vendored
View File

@ -17,6 +17,7 @@
/configure.lineno /configure.lineno
/tags /tags
/wine /wine
/wine64
Makefile Makefile
dlldata.c dlldata.c
dlls/*/*.def dlls/*/*.def

6
configure vendored
View File

@ -4157,6 +4157,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
esac esac
enable_win16=${enable_win16:-no} enable_win16=${enable_win16:-no}
enable_win64=${enable_win64:-no}
enable_winetest=${enable_winetest:-$enable_tests} enable_winetest=${enable_winetest:-$enable_tests}
@ -14977,6 +14978,10 @@ test "$srcdir" = "." || wine_fn_config_symlink tools/l_intl.nls
fi fi
ac_config_links="$ac_config_links wine:tools/winewrapper" ac_config_links="$ac_config_links wine:tools/winewrapper"
wine_fn_config_symlink wine wine_fn_config_symlink wine
if test "x$enable_win64" != xno; then
ac_config_links="$ac_config_links wine64:tools/winewrapper"
wine_fn_config_symlink wine64
fi
ac_config_commands="$ac_config_commands dlls/gdi32/dibdrv" ac_config_commands="$ac_config_commands dlls/gdi32/dibdrv"
@ -16468,6 +16473,7 @@ do
"fonts/tahomabd.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahomabd.ttf:fonts/tahomabd.ttf" ;; "fonts/tahomabd.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahomabd.ttf:fonts/tahomabd.ttf" ;;
"tools/l_intl.nls") CONFIG_LINKS="$CONFIG_LINKS tools/l_intl.nls:tools/l_intl.nls" ;; "tools/l_intl.nls") CONFIG_LINKS="$CONFIG_LINKS tools/l_intl.nls:tools/l_intl.nls" ;;
"wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;;
"wine64") CONFIG_LINKS="$CONFIG_LINKS wine64:tools/winewrapper" ;;
"dlls/gdi32/dibdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/dibdrv" ;; "dlls/gdi32/dibdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/dibdrv" ;;
"dlls/gdi32/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;; "dlls/gdi32/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;;
"dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;; "dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;;

View File

@ -190,6 +190,7 @@ esac
dnl enable_win16 defaults to yes on x86, to no on other CPUs dnl enable_win16 defaults to yes on x86, to no on other CPUs
enable_win16=${enable_win16:-no} enable_win16=${enable_win16:-no}
enable_win64=${enable_win64:-no}
dnl Disable winetest too if tests are disabled dnl Disable winetest too if tests are disabled
enable_winetest=${enable_winetest:-$enable_tests} enable_winetest=${enable_winetest:-$enable_tests}
@ -2371,6 +2372,7 @@ WINE_CONFIG_SYMLINK(fonts/tahoma.ttf,,enable_fonts)
WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf,,enable_fonts)
WINE_CONFIG_SYMLINK(tools/l_intl.nls,,enable_tools) WINE_CONFIG_SYMLINK(tools/l_intl.nls,,enable_tools)
WINE_CONFIG_SYMLINK(wine,tools/winewrapper) WINE_CONFIG_SYMLINK(wine,tools/winewrapper)
WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,enable_win64)
WINE_CONFIG_EXTRA_DIR(dlls/gdi32/dibdrv) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/dibdrv)
WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv)

View File

@ -88,6 +88,7 @@ my @ignores = (
"/TAGS", "/TAGS",
"/tags", "/tags",
"/wine", "/wine",
"/wine64",
"Makefile", "Makefile",
"dlldata.c", "dlldata.c",
"dlls/*/*.def", "dlls/*/*.def",

View File

@ -22,10 +22,13 @@
# first determine the directory that contains the app itself # first determine the directory that contains the app itself
appdir="" appdir=""
name=$0
case "$0" in case "$0" in
*/*) */*)
# $0 contains a path, use it # $0 contains a path, use it
appdir=`dirname "$0"` appdir=`dirname "$0"`
name=`basename "$0"`
;; ;;
*) *)
# no directory in $0, search in PATH # no directory in $0, search in PATH
@ -34,7 +37,7 @@ case "$0" in
for d in $PATH for d in $PATH
do do
IFS=$saved_ifs IFS=$saved_ifs
if [ -x "$d/$0" ] if [ -x "$d/$name" ]
then then
appdir="$d" appdir="$d"
break break
@ -43,7 +46,7 @@ case "$0" in
;; ;;
esac esac
# now find the top-level directory of the source tree # now find the top-level directory of the build tree
if [ -x "$appdir/server/wineserver" ] if [ -x "$appdir/server/wineserver" ]
then topdir="$appdir" then topdir="$appdir"
@ -54,7 +57,7 @@ then topdir="$appdir/../.."
elif [ -x "$appdir/../../../server/wineserver" ] elif [ -x "$appdir/../../../server/wineserver" ]
then topdir="$appdir/../../.." then topdir="$appdir/../../.."
else else
echo "$0: could not locate Wine source tree" echo "$name: could not locate the Wine build tree"
exit 1 exit 1
fi fi
@ -81,12 +84,12 @@ else
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
fi fi
if [ -x "$topdir/loader/wine" ] if [ -x "$topdir/loader/$name" ]
then WINELOADER="$topdir/loader/$name"
elif [ -x "$topdir/loader/wine" ]
then WINELOADER="$topdir/loader/wine" then WINELOADER="$topdir/loader/wine"
elif [ -x "$topdir/loader/wine64" ]
then WINELOADER="$topdir/loader/wine64"
else else
echo "$0: could not find the wine loader in $topdir" echo "$name: could not find the Wine loader in $topdir"
exit 1 exit 1
fi fi
export WINELOADER export WINELOADER