Skip to content

W
wine-winehq
Commit 013c51ac authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

makefiles: Create 64-bit wine loader symlinks in the WoW64 build tree.

Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 0bef15b9
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 6 deletions
configure
View file @ 013c51ac
......@@ -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"
......
configure.ac
View file @ 013c51ac
......@@ -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
......
dlls/kernel32/process.c
View file @ 013c51ac
......@@ -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)
{
......
dlls/ntdll/process.c
View file @ 013c51ac
......@@ -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)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment