Alexandre Julliard : programs: Use the Wine import libraries when compiling with MinGW.
Alexandre Julliard
julliard at winehq.org
Mon May 26 13:12:51 CDT 2008
Module: wine
Branch: master
Commit: 0e3eda34254d8695798ac24257571f43c6632449
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e3eda34254d8695798ac24257571f43c6632449
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon May 26 19:26:06 2008 +0200
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 f73498e..2beec51 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 685a898..a44fe71 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 2de20fb..9f872dc 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 82ecc96..153a598 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 aa247f5..461da31 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 f1fe31b..18dd3ab 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@
More information about the wine-cvs
mailing list