Module: wine Branch: master Commit: 4422d22cfe090b30b76490942c6c213a953f5b8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4422d22cfe090b30b76490942c...
Author: Alexandre Julliard julliard@winehq.org Date: Tue May 10 13:26:28 2011 +0200
configure: Create a wine64 symlink in 64-bit build trees.
---
.gitignore | 1 + configure | 6 ++++++ configure.ac | 2 ++ tools/make_makefiles | 1 + tools/winewrapper | 17 ++++++++++------- 5 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore index b2ca697..667fd45 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ /configure.lineno /tags /wine +/wine64 Makefile dlldata.c dlls/*/*.def diff --git a/configure b/configure index 0d82519..2b3863e 100755 --- a/configure +++ b/configure @@ -4157,6 +4157,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext esac
enable_win16=${enable_win16:-no} +enable_win64=${enable_win64:-no}
enable_winetest=${enable_winetest:-$enable_tests}
@@ -14977,6 +14978,10 @@ test "$srcdir" = "." || wine_fn_config_symlink tools/l_intl.nls fi ac_config_links="$ac_config_links wine:tools/winewrapper" 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"
@@ -16468,6 +16473,7 @@ do "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" ;; "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/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;; "dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;; diff --git a/configure.ac b/configure.ac index a5c5baa..d68ae2a 100644 --- a/configure.ac +++ b/configure.ac @@ -190,6 +190,7 @@ esac
dnl enable_win16 defaults to yes on x86, to no on other CPUs enable_win16=${enable_win16:-no} +enable_win64=${enable_win64:-no}
dnl Disable winetest too if tests are disabled 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(tools/l_intl.nls,,enable_tools) 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/enhmfdrv) diff --git a/tools/make_makefiles b/tools/make_makefiles index b512d62..62a66a5 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -88,6 +88,7 @@ my @ignores = ( "/TAGS", "/tags", "/wine", + "/wine64", "Makefile", "dlldata.c", "dlls/*/*.def", diff --git a/tools/winewrapper b/tools/winewrapper index a4d17ac..b324daa 100755 --- a/tools/winewrapper +++ b/tools/winewrapper @@ -22,10 +22,13 @@ # first determine the directory that contains the app itself
appdir="" +name=$0 + case "$0" in */*) # $0 contains a path, use it appdir=`dirname "$0"` + name=`basename "$0"` ;; *) # no directory in $0, search in PATH @@ -34,7 +37,7 @@ case "$0" in for d in $PATH do IFS=$saved_ifs - if [ -x "$d/$0" ] + if [ -x "$d/$name" ] then appdir="$d" break @@ -43,7 +46,7 @@ case "$0" in ;; 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" ] then topdir="$appdir" @@ -54,7 +57,7 @@ then topdir="$appdir/../.." elif [ -x "$appdir/../../../server/wineserver" ] then topdir="$appdir/../../.." else - echo "$0: could not locate Wine source tree" + echo "$name: could not locate the Wine build tree" exit 1 fi
@@ -81,12 +84,12 @@ else export LD_LIBRARY_PATH 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" -elif [ -x "$topdir/loader/wine64" ] -then WINELOADER="$topdir/loader/wine64" else - echo "$0: could not find the wine loader in $topdir" + echo "$name: could not find the Wine loader in $topdir" exit 1 fi export WINELOADER