Alexandre Julliard : tests: Use the Wine import libraries when compiling with MinGW.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Mon May 26 19:26:20 2008 +0200

tests: Use the Wine import libraries when compiling with MinGW.

---

dlls/Maketest.rules.in         |    4 ++--
 dlls/msvcrt/tests/Makefile.in  |    3 ++-
 dlls/msvcrtd/tests/Makefile.in |    3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in
index 6c70a23..5256900 100644
--- a/dlls/Maketest.rules.in
+++ b/dlls/Maketest.rules.in
@@ -33,12 +33,12 @@ all: $(TESTPROGRAM)
 # Rules for .so main module

$(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in
-	$(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mconsole $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) $(ALL_LIBS)
+	$(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mconsole $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) $(ALL_LIBS)

# Rules for .exe main module

$(MODULE): $(OBJS) $(RCOBJS) Makefile.in
-	$(CC) $(OBJS) $(RCOBJS) -o $@ $(ALL_LIBS)
+	$(CC) $(APPMODE) $(OBJS) $(RCOBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-L$(DLLDIR)/%) $(ALL_LIBS)

# Rules for building test list

diff --git a/dlls/msvcrt/tests/Makefile.in b/dlls/msvcrt/tests/Makefile.in
index 04ac448..74199e1 100644
--- a/dlls/msvcrt/tests/Makefile.in
+++ b/dlls/msvcrt/tests/Makefile.in
@@ -3,7 +3,8 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msvcrt.dll
-IMPORTS   = msvcrt kernel32
+APPMODE   = -mno-cygwin
+IMPORTS   = kernel32
 MODCFLAGS = @BUILTINFLAG@
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt -I$(SRCDIR)/..

diff --git a/dlls/msvcrtd/tests/Makefile.in b/dlls/msvcrtd/tests/Makefile.in
index 9045ee8..7f52bfa 100644
--- a/dlls/msvcrtd/tests/Makefile.in
+++ b/dlls/msvcrtd/tests/Makefile.in
@@ -3,7 +3,8 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msvcrtd.dll
-IMPORTS   = msvcrt kernel32
+APPMODE   = -mno-cygwin
+IMPORTS   = kernel32
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 MODCFLAGS = @BUILTINFLAG@