Alexandre Julliard : makefiles: Pass the target flags to winegcc.

Alexandre Julliard julliard at winehq.org
Mon Feb 9 10:29:09 CST 2009


Module: wine
Branch: master
Commit: 88fd1ba7b53532161301e9c7cffee96b4a1b84ad
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=88fd1ba7b53532161301e9c7cffee96b4a1b84ad

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Feb  6 20:31:59 2009 +0100

makefiles: Pass the target flags to winegcc.

---

 Make.rules.in                 |    2 +-
 dlls/Makedll.rules.in         |    2 +-
 dlls/Maketest.rules.in        |    2 +-
 programs/Makeprog.rules.in    |    2 +-
 programs/winetest/Makefile.in |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index b4020aa..7066c98 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -74,7 +74,7 @@ MAKECTESTS   = $(TOOLSDIR)/tools/make_ctests
 WRC          = $(TOOLSDIR)/tools/wrc/wrc
 WMC          = $(TOOLSDIR)/tools/wmc/wmc
 WIDL         = $(TOOLSDIR)/tools/widl/widl
-WINEGCC      = $(TOOLSDIR)/tools/winegcc/winegcc
+WINEGCC      = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild
 RELPATH      = $(TOOLSDIR)/tools/relpath
 SFNT2FNT     = $(TOOLSDIR)/tools/sfnt2fnt
 FNT2FON      = $(TOOLSDIR)/tools/fnt2fon
diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index 12be790..c318bf2 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -32,7 +32,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) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
+	$(WINEGCC) -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
 
 # Rules for .dll files
 
diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in
index 4bc23e2..05a9774 100644
--- a/dlls/Maketest.rules.in
+++ b/dlls/Maketest.rules.in
@@ -33,7 +33,7 @@ all: $(TESTPROGRAM)
 # Rules for .so main module
 
 $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in
-	$(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mconsole $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) $(ALL_LIBS)
+	$(WINEGCC) -mconsole $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) $(ALL_LIBS)
 
 # Rules for .exe main module
 
diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index 9a6fad6..ea39636 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -23,7 +23,7 @@ all: $(MODULE)$(DLLEXT) $(BASEMODULE)$(EXEEXT)
 # Rules for .so main module
 
 $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in
-	$(WINEGCC) -B$(TOOLSDIR)/tools/winebuild $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%)
+	$(WINEGCC) $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%)
 
 $(BASEMODULE): $(WINEWRAPPER)
 	$(RM) $@ && $(LN_S) $(WINEWRAPPER) $@
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index 1139ee3..d50284a 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -46,7 +46,7 @@ depend: tests.rc
 dist: winetest-dist.exe$(DLLEXT) winetest-dist$(EXEEXT)
 
 winetest-dist.exe.so: $(OBJS) dist.res Makefile.in
-	$(WINEGCC) -B$(TOOLSDIR)/tools/winebuild $(APPMODE) $(OBJS) dist.res -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
+	$(WINEGCC) $(APPMODE) $(OBJS) dist.res -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
 
 winetest-dist: $(WINEWRAPPER)
 	$(RM) $@ && $(LN_S) $(WINEWRAPPER) $@




More information about the wine-cvs mailing list