From ccc3d66c4abd09258d9e2c8af76f69aeda52272e Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 2 Mar 2004 06:58:21 +0000 Subject: [PATCH] Build the tests with winegcc. --- Make.rules.in | 1 + dlls/Maketest.rules.in | 9 ++------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index f38c9907b4f..26ba955d907 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -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) diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 569f4bbf967..4b287fcaaec 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -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