configure: Rename the 64-bit loader to wine64 and keep wine always for the 32-bit loader.
This provides better backwards compatibility when running with a 32-bit prefix.
This commit is contained in:
parent
3915cfbd02
commit
f3831cf2cb
|
@ -236,7 +236,7 @@ loader/wine-preloader
|
||||||
loader/wine.de.man
|
loader/wine.de.man
|
||||||
loader/wine.fr.man
|
loader/wine.fr.man
|
||||||
loader/wine.man
|
loader/wine.man
|
||||||
loader/wine32
|
loader/wine64
|
||||||
programs/Makeprog.rules
|
programs/Makeprog.rules
|
||||||
programs/rpcss/epm.h
|
programs/rpcss/epm.h
|
||||||
programs/rpcss/epm_s.c
|
programs/rpcss/epm_s.c
|
||||||
|
|
|
@ -12250,7 +12250,7 @@ esac
|
||||||
|
|
||||||
MAIN_BINARY="wine"
|
MAIN_BINARY="wine"
|
||||||
|
|
||||||
test -z "$with_wine64" || MAIN_BINARY="wine32"
|
test "x$enable_win64" != "xyes" || MAIN_BINARY="wine64"
|
||||||
|
|
||||||
case $host_cpu in
|
case $host_cpu in
|
||||||
*i[3456789]86*)
|
*i[3456789]86*)
|
||||||
|
@ -14818,13 +14818,13 @@ ac_config_files="$ac_config_files Make.tmp:Makefile.in"
|
||||||
|
|
||||||
if test -n "$with_wine64"
|
if test -n "$with_wine64"
|
||||||
then
|
then
|
||||||
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "all: fonts server $with_wine64/loader/wine32
|
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "all: fonts server $with_wine64/loader/wine
|
||||||
fonts server:
|
fonts server:
|
||||||
\$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@
|
\$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@
|
||||||
$with_wine64/loader/wine32:
|
$with_wine64/loader/wine:
|
||||||
\$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine32 \$@
|
\$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@
|
||||||
clean::
|
clean::
|
||||||
\$(RM) fonts server $with_wine64/loader/wine32"
|
\$(RM) fonts server $with_wine64/loader/wine"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "uninstall::
|
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "uninstall::
|
||||||
|
|
10
configure.ac
10
configure.ac
|
@ -1734,7 +1734,7 @@ case $host_os in
|
||||||
esac
|
esac
|
||||||
|
|
||||||
AC_SUBST(MAIN_BINARY,"wine")
|
AC_SUBST(MAIN_BINARY,"wine")
|
||||||
test -z "$with_wine64" || MAIN_BINARY="wine32"
|
test "x$enable_win64" != "xyes" || MAIN_BINARY="wine64"
|
||||||
|
|
||||||
case $host_cpu in
|
case $host_cpu in
|
||||||
*i[[3456789]]86*)
|
*i[[3456789]]86*)
|
||||||
|
@ -2753,13 +2753,13 @@ dnl Some final makefile rules
|
||||||
if test -n "$with_wine64"
|
if test -n "$with_wine64"
|
||||||
then
|
then
|
||||||
WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
|
WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
|
||||||
[all: fonts server $with_wine64/loader/wine32
|
[all: fonts server $with_wine64/loader/wine
|
||||||
fonts server:
|
fonts server:
|
||||||
\$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@]
|
\$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@]
|
||||||
$with_wine64/loader/wine32:
|
$with_wine64/loader/wine:
|
||||||
\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine32 \$[@]
|
\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@]
|
||||||
clean::
|
clean::
|
||||||
\$(RM) fonts server $with_wine64/loader/wine32])
|
\$(RM) fonts server $with_wine64/loader/wine])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
|
WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
|
||||||
|
|
|
@ -1579,17 +1579,17 @@ static const char *get_alternate_loader( char **ret_env )
|
||||||
|
|
||||||
*ret_env = NULL;
|
*ret_env = NULL;
|
||||||
|
|
||||||
if (wine_get_build_dir()) loader = is_win64 ? "loader/wine32" : "server/../loader/wine";
|
if (wine_get_build_dir()) loader = is_win64 ? "loader/wine" : "server/../loader/wine64";
|
||||||
|
|
||||||
if (loader_env)
|
if (loader_env)
|
||||||
{
|
{
|
||||||
int len = strlen( loader_env );
|
int len = strlen( loader_env );
|
||||||
if (is_win64)
|
if (!is_win64)
|
||||||
{
|
{
|
||||||
if (!(env = HeapAlloc( GetProcessHeap(), 0, sizeof("WINELOADER=") + len + 2 ))) return NULL;
|
if (!(env = HeapAlloc( GetProcessHeap(), 0, sizeof("WINELOADER=") + len + 2 ))) return NULL;
|
||||||
strcpy( env, "WINELOADER=" );
|
strcpy( env, "WINELOADER=" );
|
||||||
strcat( env, loader_env );
|
strcat( env, loader_env );
|
||||||
strcat( env, "32" );
|
strcat( env, "64" );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -1597,7 +1597,7 @@ static const char *get_alternate_loader( char **ret_env )
|
||||||
strcpy( env, "WINELOADER=" );
|
strcpy( env, "WINELOADER=" );
|
||||||
strcat( env, loader_env );
|
strcat( env, loader_env );
|
||||||
len += sizeof("WINELOADER=") - 1;
|
len += sizeof("WINELOADER=") - 1;
|
||||||
if (!strcmp( env + len - 2, "32" )) env[len - 2] = 0;
|
if (!strcmp( env + len - 2, "64" )) env[len - 2] = 0;
|
||||||
}
|
}
|
||||||
if (!loader)
|
if (!loader)
|
||||||
{
|
{
|
||||||
|
@ -1606,7 +1606,7 @@ static const char *get_alternate_loader( char **ret_env )
|
||||||
}
|
}
|
||||||
*ret_env = env;
|
*ret_env = env;
|
||||||
}
|
}
|
||||||
if (!loader) loader = is_win64 ? "wine32" : "wine";
|
if (!loader) loader = is_win64 ? "wine" : "wine64";
|
||||||
return loader;
|
return loader;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1637,7 +1637,7 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW
|
||||||
|
|
||||||
if (!is_win64 && !is_wow64 && (binary_info->flags & BINARY_FLAG_64BIT))
|
if (!is_win64 && !is_wow64 && (binary_info->flags & BINARY_FLAG_64BIT))
|
||||||
{
|
{
|
||||||
ERR( "starting 64-bit process %s not supported on this platform\n", debugstr_w(filename) );
|
ERR( "starting 64-bit process %s not supported on this environment\n", debugstr_w(filename) );
|
||||||
SetLastError( ERROR_BAD_EXE_FORMAT );
|
SetLastError( ERROR_BAD_EXE_FORMAT );
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ EXTRA_BINARIES = @EXTRA_BINARIES@
|
||||||
|
|
||||||
PROGRAMS = \
|
PROGRAMS = \
|
||||||
wine \
|
wine \
|
||||||
wine32 \
|
wine64 \
|
||||||
wine-installed \
|
wine-installed \
|
||||||
wine-preloader
|
wine-preloader
|
||||||
|
|
||||||
|
|
|
@ -83,8 +83,8 @@ fi
|
||||||
|
|
||||||
if [ -x "$topdir/loader/wine" ]
|
if [ -x "$topdir/loader/wine" ]
|
||||||
then WINELOADER="$topdir/loader/wine"
|
then WINELOADER="$topdir/loader/wine"
|
||||||
elif [ -x "$topdir/loader/wine32" ]
|
elif [ -x "$topdir/loader/wine64" ]
|
||||||
then WINELOADER="$topdir/loader/wine32"
|
then WINELOADER="$topdir/loader/wine64"
|
||||||
else
|
else
|
||||||
echo "$0: could not find the wine loader in $topdir"
|
echo "$0: could not find the wine loader in $topdir"
|
||||||
exit 1
|
exit 1
|
||||||
|
|
Loading…
Reference in New Issue