system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 15:34:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makedll.rules: Add a generic EXTRADLLFLAGS variable instead of defining a specific variable for every possible parameter.

Browse source
This commit is contained in:
Alexandre Julliard 2007-12-11 12:50:53 +01:00
parent 7f10ee453a
commit a5fb981ace
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/Makedll.rules.in
View file

@ -4,7 +4,6 @@
# MODULE : name of the main module being built
# EXTRALIBS : extra libraries to link in (optional)
# SPEC_SRCS16 : interface definition files for 16-bit dlls (optional)
# SUBSYSTEM : (optional) subsystem (for native dlls)
#
# plus all variables required by the global Make.rules.in
#
@ -32,7 +31,7 @@ all: $(MODULE)$(DLLEXT) $(SUBDIRS)
# Rules for .so files
$(MODULE).so: $(MAINSPEC) $(ALL_OBJS) Makefile.in
$(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) $(DLLFILENAME:%=-Wb,-F,%) $(BASEADDRESS:%=-Wl,--image-base,%) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
$(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
# Rules for .dll files

3
dlls/kernel32/Makefile.in
View file

@ -7,8 +7,7 @@ MODULE = kernel32.dll
IMPORTLIB = libkernel32.$(IMPLIBEXT)
IMPORTS = ntdll
EXTRALIBS = @COREFOUNDATIONLIB@ @LIBPOLL@
DLLFILENAME = KERNEL32.dll
BASEADDRESS = 0x7b800000
EXTRADLLFLAGS = -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000
SPEC_SRCS16 = \
comm.drv.spec \

2
dlls/ntdll/Makefile.in
View file

@ -6,7 +6,7 @@ VPATH = @srcdir@
MODULE = ntdll.dll
IMPORTLIB = libntdll.$(IMPLIBEXT)
EXTRALIBS = @IOKITLIB@
BASEADDRESS = 0x7bc00000
EXTRADLLFLAGS = -Wl,--image-base,0x7bc00000
C_SRCS = \
actctx.c \