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

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

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2018-11-26 14:06:39 +01:00
parent 0bef15b965
commit 013c51aca0
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -20188,15 +20188,21 @@ fi
if test -n "$with_wine64" if test -n "$with_wine64"
then 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: fonts server:
\$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@ \$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@
loader/wine64 loader/wine64-preloader:
\$(RM) \$@ && \$(LN_S) $reldir$with_wine64/\$@ \$@
$with_wine64/loader/wine: $with_wine64/loader/wine:
\$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@ \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@
$with_wine64/loader/wine-preloader: $with_wine64/loader/wine-preloader:
\$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@ \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@
clean:: 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 else
WINELOADER_INSTALL="wine.inf l_intl.nls" WINELOADER_INSTALL="wine.inf l_intl.nls"

10
configure.ac
View File

@ -4058,16 +4058,22 @@ fi
if test -n "$with_wine64" if test -n "$with_wine64"
then then
case "$with_wine64" in
/*) reldir="" ;;
*) reldir="../" ;;
esac
WINE_APPEND_RULE( 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: fonts server:
\$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@] \$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@]
loader/wine64 loader/wine64-preloader:
\$(RM) \$[@] && \$(LN_S) $reldir$with_wine64/\$[@] \$[@]
$with_wine64/loader/wine: $with_wine64/loader/wine:
\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@] \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@]
$with_wine64/loader/wine-preloader: $with_wine64/loader/wine-preloader:
\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@] \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@]
clean:: 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 else
AC_SUBST(WINELOADER_INSTALL,"wine.inf l_intl.nls") AC_SUBST(WINELOADER_INSTALL,"wine.inf l_intl.nls")
case $host_os in case $host_os in

2
dlls/kernel32/process.c
View File

@ -1958,7 +1958,7 @@ static const char *get_alternate_loader( char **ret_env )
*ret_env = NULL; *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) if (loader_env)
{ {

2
dlls/ntdll/process.c
View File

@ -976,7 +976,7 @@ static const char *get_alternate_loader( char **ret_env )
*ret_env = NULL; *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) if (loader_env)
{ {