Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Davide Beatrici
wine
Commits
5da03c7a
Commit
5da03c7a
authored
11 months ago
by
Brendan Shanks
Committed by
Alexandre Julliard
8 months ago
Browse files
Options
Downloads
Patches
Plain Diff
configure: Define HAVE_WINE_PRELOADER when the preloader is being built.
parent
266e95a2
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
configure
+3
-0
3 additions, 0 deletions
configure
configure.ac
+1
-0
1 addition, 0 deletions
configure.ac
dlls/ntdll/unix/loader.c
+2
-2
2 additions, 2 deletions
dlls/ntdll/unix/loader.c
include/config.h.in
+3
-0
3 additions, 0 deletions
include/config.h.in
with
9 additions
and
2 deletions
configure
+
3
−
0
View file @
5da03c7a
...
...
@@ -20457,6 +20457,9 @@ if test "$wine_use_preloader" = "yes"
then
test "$wine_binary" = wine || as_fn_append CONFIGURE_TARGETS " loader/wine-preloader"
WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader"
printf "%s\n" "#define HAVE_WINE_PRELOADER 1" >>confdefs.h
fi
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
1
−
0
View file @
5da03c7a
...
...
@@ -2042,6 +2042,7 @@ if test "$wine_use_preloader" = "yes"
then
test "$wine_binary" = wine || WINE_IGNORE_FILE(loader/wine-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
dnl **** Check for functions ****
...
...
This diff is collapsed.
Click to expand it.
dlls/ntdll/unix/loader.c
+
2
−
2
View file @
5da03c7a
...
...
@@ -147,7 +147,7 @@ SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4] =
static
void
fatal_error
(
const
char
*
err
,
...
)
__attribute__
((
noreturn
,
format
(
printf
,
1
,
2
)));
#endif
#if
def
ined(linux) || defined(__APPLE__)
#ifdef
HAVE_WINE_PRELOADER
static
const
BOOL
use_preloader
=
TRUE
;
#else
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 */
}
#elif defined(__APPLE__) &&
(
defined(
__i386__) || defined(__x86_64__)
)
#elif defined(__APPLE__) && defined(
HAVE_WINE_PRELOADER
)
static
int
pre_exec
(
void
)
{
...
...
This diff is collapsed.
Click to expand it.
include/config.h.in
+
3
−
0
View file @
5da03c7a
...
...
@@ -642,6 +642,9 @@
/* Define to 1 if you have the <valgrind/valgrind.h> header file. */
#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. */
#undef HAVE_X11_EXTENSIONS_SHAPE_H
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment