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
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Ekaterine Papava
wine
Commits
912fd620
Commit
912fd620
authored
1 year ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
makefiles: Define WINE_UNIX_LIB for all files that are built for Unix.
parent
93630ce1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
configure
+1
-1
1 addition, 1 deletion
configure
configure.ac
+1
-1
1 addition, 1 deletion
configure.ac
include/windef.h
+5
-1
5 additions, 1 deletion
include/windef.h
tools/makedep.c
+1
-1
1 addition, 1 deletion
tools/makedep.c
with
8 additions
and
4 deletions
configure
+
1
−
1
View file @
912fd620
...
...
@@ -23023,7 +23023,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
wine_fn_output_makedep ()
{
as_dir=tools; as_fn_mkdir_p
$CC -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__ $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext ${wine_srcdir}tools/makedep.c $LDFLAGS
$CC -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__
-DWINE_UNIX_LIB
$EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext ${wine_srcdir}tools/makedep.c $LDFLAGS
}
wine_fn_output_makefile ()
{
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
1
−
1
View file @
912fd620
...
...
@@ -3462,7 +3462,7 @@ then
[wine_fn_output_makedep ()
{
AS_MKDIR_P(tools)
$CC -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__ $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext ${wine_srcdir}tools/makedep.c $LDFLAGS
$CC -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__
-DWINE_UNIX_LIB
$EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext ${wine_srcdir}tools/makedep.c $LDFLAGS
}])
fi
...
...
This diff is collapsed.
Click to expand it.
include/windef.h
+
5
−
1
View file @
912fd620
...
...
@@ -54,11 +54,13 @@ extern "C" {
# endif
#endif
#if !defined(_MSC_VER) && !defined(__MINGW32__)
#ifdef WINE_UNIX_LIB
# define __stdcall
# define __cdecl
# define __fastcall
#el
if !defined(_MSC_VER) && !defined(__MINGW32__)
#el
se
# undef __stdcall
# ifdef __i386__
# ifdef __GNUC__
...
...
@@ -99,6 +101,8 @@ extern "C" {
# ifndef __thiscall
# define __thiscall __stdcall
# endif
#endif
/* WINE_UNIX_LIB */
#endif
/* _MSC_VER || __MINGW32__ */
#ifndef __ms_va_list
...
...
This diff is collapsed.
Click to expand it.
tools/makedep.c
+
1
−
1
View file @
912fd620
...
...
@@ -2351,7 +2351,6 @@ static struct strarray get_source_defines( struct makefile *make, struct incl_fi
}
strarray_addall
(
&
ret
,
make
->
define_args
);
strarray_addall
(
&
ret
,
get_expanded_file_local_var
(
make
,
obj
,
"EXTRADEFS"
));
if
(
source
->
file
->
flags
&
FLAG_C_UNIX
)
strarray_add
(
&
ret
,
"-DWINE_UNIX_LIB"
);
return
ret
;
}
...
...
@@ -4247,6 +4246,7 @@ static void load_sources( struct makefile *make )
make
->
define_args
=
empty_strarray
;
make
->
unix_cflags
=
empty_strarray
;
if
(
!
make
->
extlib
)
strarray_add
(
&
make
->
define_args
,
"-D__WINESRC__"
);
strarray_add
(
&
make
->
unix_cflags
,
"-DWINE_UNIX_LIB"
);
value
=
get_expanded_make_var_array
(
make
,
"EXTRAINCL"
);
for
(
i
=
0
;
i
<
value
.
count
;
i
++
)
...
...
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