Alexandre Julliard : makefiles: Create 64-bit wine loader symlinks in the WoW64 build tree.
Alexandre Julliard
julliard at winehq.org
Mon Nov 26 16:20:11 CST 2018
Module: wine
Branch: master
Commit: 013c51aca031676f629f9e9601085f6c88f54647
URL: https://source.winehq.org/git/wine.git/?a=commit;h=013c51aca031676f629f9e9601085f6c88f54647
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Nov 26 14:06:39 2018 +0100
makefiles: Create 64-bit wine loader symlinks in the WoW64 build tree.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure | 10 ++++++++--
configure.ac | 10 ++++++++--
dlls/kernel32/process.c | 2 +-
dlls/ntdll/process.c | 2 +-
4 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index 3c235e3..63f4633 100755
--- a/configure
+++ b/configure
@@ -20188,15 +20188,21 @@ fi
if test -n "$with_wine64"
then
- wine_fn_append_rule "all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader
+ case "$with_wine64" in
+ /*) reldir="" ;;
+ *) reldir="../" ;;
+ esac
+ wine_fn_append_rule "all: fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader
fonts server:
\$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@
+loader/wine64 loader/wine64-preloader:
+ \$(RM) \$@ && \$(LN_S) $reldir$with_wine64/\$@ \$@
$with_wine64/loader/wine:
\$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@
$with_wine64/loader/wine-preloader:
\$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@
clean::
- \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
+ \$(RM) fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
else
WINELOADER_INSTALL="wine.inf l_intl.nls"
diff --git a/configure.ac b/configure.ac
index 294fe4b..39cabf2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4058,16 +4058,22 @@ fi
if test -n "$with_wine64"
then
+ case "$with_wine64" in
+ /*) reldir="" ;;
+ *) reldir="../" ;;
+ esac
WINE_APPEND_RULE(
-[all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader
+[all: fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader
fonts server:
\$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@]
+loader/wine64 loader/wine64-preloader:
+ \$(RM) \$[@] && \$(LN_S) $reldir$with_wine64/\$[@] \$[@]
$with_wine64/loader/wine:
\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@]
$with_wine64/loader/wine-preloader:
\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@]
clean::
- \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
+ \$(RM) fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
else
AC_SUBST(WINELOADER_INSTALL,"wine.inf l_intl.nls")
case $host_os in
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index abf33df..26c576e 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -1958,7 +1958,7 @@ static const char *get_alternate_loader( char **ret_env )
*ret_env = NULL;
- if (wine_get_build_dir()) loader = is_win64 ? "loader/wine" : "server/../loader/wine64";
+ if (wine_get_build_dir()) loader = is_win64 ? "loader/wine" : "loader/wine64";
if (loader_env)
{
diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
index 623bf65..2ff8610 100644
--- a/dlls/ntdll/process.c
+++ b/dlls/ntdll/process.c
@@ -976,7 +976,7 @@ static const char *get_alternate_loader( char **ret_env )
*ret_env = NULL;
- if (wine_get_build_dir()) loader = is_win64 ? "loader/wine" : "server/../loader/wine64";
+ if (wine_get_build_dir()) loader = is_win64 ? "loader/wine" : "loader/wine64";
if (loader_env)
{
More information about the wine-cvs
mailing list