From 0e3eda34254d8695798ac24257571f43c6632449 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 26 May 2008 19:26:06 +0200
Subject: [PATCH] programs: Use the Wine import libraries when compiling with
 MinGW.

---
 programs/Makeprog.rules.in   | 2 +-
 programs/notepad/Makefile.in | 4 ++--
 programs/regedit/Makefile.in | 4 ++--
 programs/taskmgr/Makefile.in | 4 ++--
 programs/wordpad/Makefile.in | 4 ++--
 programs/xcopy/Makefile.in   | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index f73498e7711..2beec5133a1 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -31,7 +31,7 @@ $(BASEMODULE): $(WINEWRAPPER)
 # Rules for .exe main module
 
 $(MODULE): $(OBJS) $(RCOBJS) Makefile.in
-	$(CC) $(APPMODE) $(OBJS) $(RCOBJS) -o $@ $(LIBWINE) $(ALL_LIBS)
+	$(CC) $(APPMODE) $(OBJS) $(RCOBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-L$(DLLDIR)/%) $(DELAYIMPORTS:%=-L$(DLLDIR)/%) $(LIBWINE) $(ALL_LIBS)
 
 # Rules for testing
 
diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index 685a898384f..a44fe714bce 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = notepad.exe
-APPMODE   = -mwindows
-IMPORTS   = comdlg32 shell32 shlwapi user32 gdi32 msvcrt advapi32 kernel32
+APPMODE   = -mwindows -mno-cygwin
+IMPORTS   = comdlg32 shell32 shlwapi user32 gdi32 advapi32 kernel32
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 MODCFLAGS = @BUILTINFLAG@
 EXTRADEFS = -DNO_LIBWINE_PORT
diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in
index 2de20fb2776..9f872dca66d 100644
--- a/programs/regedit/Makefile.in
+++ b/programs/regedit/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = regedit.exe
-APPMODE   = -mwindows
-IMPORTS   = msvcrt advapi32 kernel32
+APPMODE   = -mwindows -mno-cygwin
+IMPORTS   = advapi32 kernel32
 DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 EXTRADEFS = -DNO_LIBWINE_PORT
diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in
index 82ecc96a2db..153a598af30 100644
--- a/programs/taskmgr/Makefile.in
+++ b/programs/taskmgr/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = taskmgr.exe
-APPMODE   = -mwindows
-IMPORTS   = psapi shell32 comctl32 msvcrt user32 gdi32 advapi32 kernel32
+APPMODE   = -mwindows -mno-cygwin
+IMPORTS   = psapi shell32 comctl32 user32 gdi32 advapi32 kernel32
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 EXTRADEFS = -DNO_LIBWINE_PORT
 MODCFLAGS = @BUILTINFLAG@
diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in
index aa247f5f0ca..461da31d7ae 100644
--- a/programs/wordpad/Makefile.in
+++ b/programs/wordpad/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wordpad.exe
-APPMODE   = -mwindows
-IMPORTS   = comdlg32 shell32 user32 gdi32 msvcrt advapi32 kernel32 comctl32
+APPMODE   = -mwindows -mno-cygwin
+IMPORTS   = comdlg32 shell32 user32 gdi32 advapi32 kernel32 comctl32
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 EXTRADEFS = -DNO_LIBWINE_PORT
 MODCFLAGS = @BUILTINFLAG@
diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in
index f1fe31baf6b..18dd3ab4a94 100644
--- a/programs/xcopy/Makefile.in
+++ b/programs/xcopy/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = xcopy.exe
-APPMODE   = -mconsole -municode
-IMPORTS   = shell32 user32 msvcrt kernel32
+APPMODE   = -mconsole -municode -mno-cygwin
+IMPORTS   = shell32 user32 kernel32
 EXTRADEFS = -DUNICODE
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 MODCFLAGS = @BUILTINFLAG@