system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-30 05:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

configure: Define HAVE_WINE_PRELOADER when the preloader is being built.

Browse source
This commit is contained in:
Brendan Shanks 2024-04-04 11:59:51 -07:00 committed by Alexandre Julliard
parent 266e95a21b
commit 5da03c7a60
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure vendored
View file

@ -20457,6 +20457,9 @@ if test "$wine_use_preloader" = "yes"
then then
test "$wine_binary" = wine || as_fn_append CONFIGURE_TARGETS " loader/wine-preloader" test "$wine_binary" = wine || as_fn_append CONFIGURE_TARGETS " loader/wine-preloader"
WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader" WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader"
printf "%s\n" "#define HAVE_WINE_PRELOADER 1" >>confdefs.h
fi fi

1
configure.ac
View file

@ -2042,6 +2042,7 @@ if test "$wine_use_preloader" = "yes"
then then
test "$wine_binary" = wine || WINE_IGNORE_FILE(loader/wine-preloader) test "$wine_binary" = wine || WINE_IGNORE_FILE(loader/wine-preloader)
WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader" WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader"
AC_DEFINE(HAVE_WINE_PRELOADER, 1, [Define to 1 if the Wine preloader is being used.])
fi fi
dnl **** Check for functions **** dnl **** Check for functions ****

4
dlls/ntdll/unix/loader.c
View file

@ -147,7 +147,7 @@ SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4] =
static void fatal_error( const char *err, ... ) __attribute__((noreturn, format(printf,1,2))); static void fatal_error( const char *err, ... ) __attribute__((noreturn, format(printf,1,2)));
#endif #endif
#if defined(linux) || defined(__APPLE__) #ifdef HAVE_WINE_PRELOADER
static const BOOL use_preloader = TRUE; static const BOOL use_preloader = TRUE;
#else #else
static const BOOL use_preloader = FALSE; static const BOOL use_preloader = FALSE;
@ -2074,7 +2074,7 @@ static int pre_exec(void)
return 1; /* we have a preloader on x86-64/arm64 */ return 1; /* we have a preloader on x86-64/arm64 */
} }
#elif defined(__APPLE__) && (defined(__i386__) || defined(__x86_64__)) #elif defined(__APPLE__) && defined(HAVE_WINE_PRELOADER)
static int pre_exec(void) static int pre_exec(void)
{ {

3
include/config.h.in
View file

@ -642,6 +642,9 @@
/* Define to 1 if you have the <valgrind/valgrind.h> header file. */ /* Define to 1 if you have the <valgrind/valgrind.h> header file. */
#undef HAVE_VALGRIND_VALGRIND_H #undef HAVE_VALGRIND_VALGRIND_H
/* Define to 1 if the Wine preloader is being used. */
#undef HAVE_WINE_PRELOADER
/* Define to 1 if you have the <X11/extensions/shape.h> header file. */ /* Define to 1 if you have the <X11/extensions/shape.h> header file. */
#undef HAVE_X11_EXTENSIONS_SHAPE_H #undef HAVE_X11_EXTENSIONS_SHAPE_H