ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Support per-platform values for EXTRADLLFLAGS. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-12-02 09:59:49 +01:00
parent d10410eac2
commit a041075cd2
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/ntdll/Makefile.in
View File

@ -7,6 +7,7 @@ EXTRAINCL = $(UNWIND_CFLAGS)
EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS)
EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000 EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000
x86_64_EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x170000000
C_SRCS = \ C_SRCS = \
actctx.c \ actctx.c \

6
tools/makedep.c
View File

@ -4131,6 +4131,12 @@ static void load_sources( struct makefile *make )
if (make->extlib) make->staticlib = make->extlib; if (make->extlib) make->staticlib = make->extlib;
if (make->staticlib) make->module = make->staticlib; if (make->staticlib) make->module = make->staticlib;
if (host_cpu)
{
value = get_expanded_file_local_var( make, host_cpu, "EXTRADLLFLAGS" );
if (value.count) make->extradllflags = value;
}
make->disabled = make->obj_dir && strarray_exists( &disabled_dirs, make->obj_dir ); make->disabled = make->obj_dir && strarray_exists( &disabled_dirs, make->obj_dir );
make->is_win16 = strarray_exists( &make->extradllflags, "-m16" ); make->is_win16 = strarray_exists( &make->extradllflags, "-m16" );
make->use_msvcrt = (make->module || make->testdll || make->is_win16) && make->use_msvcrt = (make->module || make->testdll || make->is_win16) &&