Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
229c3379
Commit
229c3379
authored
Feb 18, 2020
by
Jacek Caban
Committed by
Alexandre Julliard
Feb 18, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makedep: Define _UCRT in modules that link to ucrtbase.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
0eb79209
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
2 deletions
+14
-2
makedep.c
tools/makedep.c
+14
-2
No files found.
tools/makedep.c
View file @
229c3379
...
@@ -4172,7 +4172,7 @@ static void load_sources( struct makefile *make )
...
@@ -4172,7 +4172,7 @@ static void load_sources( struct makefile *make )
"MANPAGES"
,
"MANPAGES"
,
NULL
NULL
};
};
const
char
**
var
;
const
char
**
var
,
*
crt_dll
=
NULL
;
unsigned
int
i
;
unsigned
int
i
;
struct
strarray
value
;
struct
strarray
value
;
struct
incl_file
*
file
;
struct
incl_file
*
file
;
...
@@ -4265,11 +4265,23 @@ static void load_sources( struct makefile *make )
...
@@ -4265,11 +4265,23 @@ static void load_sources( struct makefile *make )
make
->
is_cross
=
crosstarget
&&
make
->
use_msvcrt
;
make
->
is_cross
=
crosstarget
&&
make
->
use_msvcrt
;
if
(
make
->
use_msvcrt
)
{
for
(
i
=
0
;
i
<
make
->
imports
.
count
;
i
++
)
{
if
(
strncmp
(
make
->
imports
.
str
[
i
],
"msvcr"
,
5
)
&&
strncmp
(
make
->
imports
.
str
[
i
],
"ucrt"
,
4
))
continue
;
if
(
crt_dll
)
fatal_error
(
"More than one crt DLL imported: %s %s
\n
"
,
crt_dll
,
make
->
imports
.
str
[
i
]
);
crt_dll
=
make
->
imports
.
str
[
i
];
}
if
(
!
crt_dll
)
crt_dll
=
"msvcrt"
;
if
(
!
strncmp
(
crt_dll
,
"ucrt"
,
4
))
strarray_add
(
&
make
->
define_args
,
"-D_UCRT"
);
}
if
(
make
->
is_cross
)
if
(
make
->
is_cross
)
{
{
for
(
i
=
0
;
i
<
make
->
imports
.
count
;
i
++
)
for
(
i
=
0
;
i
<
make
->
imports
.
count
;
i
++
)
strarray_add_uniq
(
&
cross_import_libs
,
make
->
imports
.
str
[
i
]
);
strarray_add_uniq
(
&
cross_import_libs
,
make
->
imports
.
str
[
i
]
);
if
(
make
->
use_msvcrt
)
strarray_add_uniq
(
&
cross_import_libs
,
"msvcrt"
);
if
(
crt_dll
)
strarray_add_uniq
(
&
cross_import_libs
,
crt_dll
);
if
(
make
->
is_win16
)
strarray_add_uniq
(
&
cross_import_libs
,
"kernel"
);
if
(
make
->
is_win16
)
strarray_add_uniq
(
&
cross_import_libs
,
"kernel"
);
strarray_add_uniq
(
&
cross_import_libs
,
"winecrt0"
);
strarray_add_uniq
(
&
cross_import_libs
,
"winecrt0"
);
strarray_add_uniq
(
&
cross_import_libs
,
"kernel32"
);
strarray_add_uniq
(
&
cross_import_libs
,
"kernel32"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment