ChangeSet ID:	11316
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard@wine.codeweavers.com	2004/03/02 00:58:21

Modified files:
	dlls           : Maketest.rules.in 
	.              : Make.rules.in 

Log message:
	Build the tests with winegcc.

Patch: http://cvs.winehq.org/patch.py?id=11316

Old revision  New revision  Changes     Path
 1.30          1.31          +2 -7       wine/dlls/Maketest.rules.in
 1.168         1.169         +1 -0       wine/Make.rules.in

Index: wine/dlls/Maketest.rules.in
diff -u -p wine/dlls/Maketest.rules.in:1.30 wine/dlls/Maketest.rules.in:1.31
--- wine/dlls/Maketest.rules.in:1.30	Mon May 20 17:35:33 2013
+++ wine/dlls/Maketest.rules.in	Mon May 20 17:35:33 2013
@@ -33,15 +33,10 @@ CROSSWINDRES = @CROSSWINDRES@
 
 all: $(TESTPROGRAM)
 
-# Rule for main module spec file
-
-$(MODULE).spec.c: $(RC_SRCS:.rc=.res) $(OBJS) $(IMPORTLIBS) $(WINEBUILD)
-	$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe $(MODULE) --mode cui $(RC_SRCS:.rc=.res) $(OBJS) -L$(DLLDIR) $(IMPORTS:%=-l%)
-
 # Rules for .so main module
 
-$(MODULE).so: $(MODULE).spec.o $(OBJS) Makefile.in
-	$(LDDLL) $(MODULE).spec.o $(OBJS) -o $@ -L$(DLLDIR) $(ALL_LIBS) -lc
+$(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) $(IMPORTLIBS) Makefile.in
+	WINEBUILD=$(WINEBUILD) $(WINEGCC) -mconsole $(OBJS) $(RC_SRCS:.rc=.res) -o $@ -L$(DLLDIR) $(IMPORTS:%=-l%) $(ALL_LIBS) -lc
 
 # Rules for .exe main module
 

Index: wine/Make.rules.in
diff -u -p wine/Make.rules.in:1.168 wine/Make.rules.in:1.169
--- wine/Make.rules.in:1.168	Mon May 20 17:35:33 2013
+++ wine/Make.rules.in	Mon May 20 17:35:33 2013
@@ -70,6 +70,7 @@ WRC          = $(TOOLSDIR)/tools/wrc/wrc
 BIN2RES      = $(TOOLSDIR)/tools/bin2res
 WMC          = $(TOOLSDIR)/tools/wmc/wmc
 WIDL         = $(TOOLSDIR)/tools/widl/widl
+WINEGCC      = $(TOOLSDIR)/tools/winegcc/winegcc
 RC           = $(WRC)
 RC16         = $(WRC)
 RCFLAGS      = --nostdinc $(INCLUDES) $(DEFS) $(EXTRARCFLAGS)