makefiles: Use winegcc to build the crosstests too.
diff --git a/configure b/configure index 35fb4ac..85f27b7 100755 --- a/configure +++ b/configure Binary files differ
diff --git a/configure.ac b/configure.ac index 9fc8936..001c312 100644 --- a/configure.ac +++ b/configure.ac
@@ -679,11 +679,11 @@ then WINE_CHECK_MINGW_PROG(CROSSCC,gcc,false) WINE_CHECK_MINGW_PROG(DLLTOOL,dlltool,false) - WINE_CHECK_MINGW_PROG(CROSSWINDRES,windres,false) WINE_CHECK_MINGW_PROG(MINGWAR,ar,false) if test "$CROSSCC" != "false" then AC_SUBST(CROSSTEST,"\$(CROSSTEST)") + AC_SUBST(CROSSTARGETFLAGS,"-b `expr $CROSSCC : '\(.*\)-gcc'`") fi fi
diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 7ea8372..0ff50d9 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in
@@ -22,9 +22,8 @@ EXTRA_OBJS = testlist.o CROSSTEST = $(TESTDLL:%.dll=%)_crosstest.exe -CROSSOBJS = $(C_SRCS:.c=.cross.o) $(RC_SRCS:.rc=.res.cross.o) $(BISON_SRCS:.y=.tab.cross.o) $(LEX_SRCS:.l=.yy.cross.o) $(IDL_GEN_C_SRCS:.c=.cross.o) testlist.cross.o CROSSCC = @CROSSCC@ -CROSSWINDRES = @CROSSWINDRES@ +CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc @CROSSTARGETFLAGS@ -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR) @MAKE_RULES@ @@ -48,18 +47,17 @@ # Rules for cross-compiling tests -.SUFFIXES: .cross.o .res.cross.o +CROSSOBJS = $(OBJS:.o=.cross.o) $(RC_SRCS:.rc=.res) + +.SUFFIXES: .cross.o .c.cross.o: $(CROSSCC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) -o $@ $< -.res.res.cross.o: - $(CROSSWINDRES) -i $< -o $@ - crosstest:: @CROSSTEST@ $(CROSSTEST): $(CROSSOBJS) Makefile.in - $(CROSSCC) $(CROSSOBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-L$(DLLDIR)/%) $(ALL_LIBS) + $(CROSSWINEGCC) $(CROSSOBJS) -o $@ $(ALL_LIBS) $(CROSSOBJS): $(IDL_GEN_HEADERS)