Build all the programs with winegcc.

programs/Makeprog.rules.in

@@ -15,21 +15,16 @@ ALL_OBJS    = $(OBJS) $(MODULE).dbg.o
 ALL_LIBS    = $(LIBWINE) $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS)
 BASEMODULE  = $(MODULE:.exe=)
 TESTIMPORTS = $(DELAYIMPORTS) $(IMPORTS)
-RUNTESTFLAGS= -q -P wine -T $(TOPOBJDIR) $(PLTESTPROGRAM:%=-p %)
+RUNTESTFLAGS= -q -P wine -T $(TOPOBJDIR)
 
 @MAKE_RULES@
 
 all: $(MODULE)$(DLLEXT) $(BASEMODULE)$(EXEEXT)
 
-# Rule for main module spec file
-
-$(MODULE).spec.c: $(RC_SRCS:.rc=.res) $(ALL_OBJS) $(WINEBUILD)
-	$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe $(MODULE) $(APPMODE:%=--mode %) $(RC_SRCS:.rc=.res) $(ALL_OBJS) -L$(DLLDIR) $(DELAYIMPORTS:%=-d%) $(IMPORTS:%=-l%)
-
 # Rules for .so main module
 
-$(MODULE).so: $(MODULE).spec.o $(ALL_OBJS) Makefile.in
-	$(LDDLL) $(MODULE).spec.o $(ALL_OBJS) -o $@ -L$(DLLDIR) $(ALL_LIBS) -lc
+$(MODULE).so: $(ALL_OBJS) $(RC_SRCS:.rc=.res) Makefile.in
+	WINEBUILD=$(WINEBUILD) $(WINEGCC) $(APPMODE) $(ALL_OBJS) $(RC_SRCS:.rc=.res) -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(IMPORTS:%=-l%) $(ALL_LIBS) -lc
 
 $(BASEMODULE): $(WINEWRAPPER)
 	$(RM) $@ && $(LN_S) $(WINEWRAPPER) $@
@@ -37,7 +32,7 @@ $(BASEMODULE): $(WINEWRAPPER)
 # Rules for .exe main module
 
 $(MODULE): $(ALL_OBJS) $(RCOBJS) Makefile.in
-	$(CC) $(ALL_OBJS) $(RCOBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS)
+	$(CC) $(APPMODE) $(ALL_OBJS) $(RCOBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS)
 
 # Rules for testing
 

programs/avitools/Makefile.in

@@ -17,32 +17,23 @@ C_SRCS = \
 
 all: $(PROGRAMS:%=%$(DLLEXT)) $(PROGRAMS:.exe=$(EXEEXT))
 
-aviinfo.exe.spec.c: aviinfo.o $(WINEBUILD)
-	$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe aviinfo.exe --mode gui aviinfo.o -L$(DLLDIR) -lavifil32 -lkernel32
+aviinfo.exe.so: aviinfo.o
+	WINEBUILD=$(WINEBUILD) $(WINEGCC) -mwindows -o $@ aviinfo.o -L$(DLLDIR) -lavifil32 $(ALL_LIBS) -lc
 
-aviplay.exe.spec.c: aviplay.o $(WINEBUILD)
-	$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe aviplay.exe --mode gui aviplay.o -L$(DLLDIR) -lavifil32 -lddraw -lkernel32
+aviplay.exe.so: aviplay.o
+	WINEBUILD=$(WINEBUILD) $(WINEGCC) -mwindows -o $@ aviplay.o -L$(DLLDIR) -lavifil32 -lddraw $(ALL_LIBS) -lc
 
-icinfo.exe.spec.c: icinfo.o $(WINEBUILD)
-	$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe icinfo.exe --mode gui icinfo.o -L$(DLLDIR) -lmsvfw32 -lkernel32
-
-aviinfo.exe.so: aviinfo.o aviinfo.exe.spec.o
-	$(LDDLL) -o $@ aviinfo.o aviinfo.exe.spec.o $(ALL_LIBS) -lc
-
-aviplay.exe.so: aviplay.o aviplay.exe.spec.o
-	$(LDDLL) -o $@ aviplay.o aviplay.exe.spec.o $(ALL_LIBS) -lc
-
-icinfo.exe.so: icinfo.o icinfo.exe.spec.o
-	$(LDDLL) -o $@ icinfo.o icinfo.exe.spec.o $(ALL_LIBS) -lc
+icinfo.exe.so: icinfo.o
+	WINEBUILD=$(WINEBUILD) $(WINEGCC) -mwindows -o $@ icinfo.o -L$(DLLDIR) -lmsvfw32 $(ALL_LIBS) -lc
 
 aviinfo.exe: aviinfo.o
-	$(CC) -o $@ aviinfo.o -lavifil32 -lkernel32 $(ALL_LIBS)
+	$(CC) -o $@ aviinfo.o -lavifil32 $(ALL_LIBS)
 
 aviplay.exe: aviplay.o
-	$(CC) -o $@ aviplay.o -lavifil32 -lddraw -lkernel32 $(ALL_LIBS)
+	$(CC) -o $@ aviplay.o -lavifil32 -lddraw $(ALL_LIBS)
 
 icinfo.exe: icinfo.o
-	$(CC) -o $@ icinfo.o -lmsvfw32 -lkernel32 $(ALL_LIBS)
+	$(CC) -o $@ icinfo.o -lmsvfw32 $(ALL_LIBS)
 
 $(PROGRAMS:.exe=): $(WINEWRAPPER)
 	$(RM) $@ && $(LN_S) $(WINEWRAPPER) $@

programs/clock/Makefile.in

@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = clock.exe
-APPMODE   = gui
-IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32
+APPMODE   = -mwindows
 
 LICENSELANG = En
 

programs/cmdlgtst/Makefile.in

@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cmdlgtst.exe
-APPMODE   = gui
-IMPORTS   = comdlg32 user32 gdi32 kernel32
+APPMODE   = -mwindows
 
 C_SRCS = \
 	cmdlgtst.c

programs/control/Makefile.in

@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = control.exe
-APPMODE   = gui
-IMPORTS   = shell32 user32 kernel32
+APPMODE   = -mwindows
 
 C_SRCS = control.c
 

programs/expand/Makefile.in

@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = expand.exe
-APPMODE   = cui
-IMPORTS   = lz32 kernel32
+APPMODE   = -mconsole
+IMPORTS   = lz32
 
 C_SRCS = expand.c
 

programs/notepad/Makefile.in

@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = notepad.exe
-APPMODE   = gui
-IMPORTS   = comdlg32 shell32 user32 gdi32 msvcrt advapi32 kernel32
+APPMODE   = -mwindows
+IMPORTS   = msvcrt
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 EXTRADEFS = -DNO_LIBWINE_PORT
 

programs/progman/Makefile.in

@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = progman.exe
-APPMODE   = gui
-IMPORTS   = shell32 comdlg32 user32 gdi32 kernel32
+APPMODE   = -mwindows
 
 LICENSELANG = En
 

programs/regedit/Makefile.in

@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = regedit.exe
-APPMODE   = gui
-IMPORTS   = msvcrt advapi32 kernel32
+APPMODE   = -mwindows
+IMPORTS   = msvcrt
 DELAYIMPORTS = shell32 comdlg32 comctl32 user32 gdi32
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 EXTRADEFS = -DNO_LIBWINE_PORT

programs/regsvr32/Makefile.in

@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = regsvr32.exe
-APPMODE   = cui
-IMPORTS   = kernel32
+APPMODE   = -mconsole
 
 C_SRCS = \
 	regsvr32.c

programs/rpcss/Makefile.in

@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rpcss.exe
-APPMODE   = cui
-IMPORTS   = kernel32
+APPMODE   = -mconsole
 
 C_SRCS = \
        epmap_server.c \

programs/rundll32/Makefile.in

@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rundll32.exe
-APPMODE   = cui
-IMPORTS   = user32 kernel32
+APPMODE   = -mconsole
 
 C_SRCS = \
 	rundll32.c

programs/start/Makefile.in

@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = start.exe
-APPMODE   = cui
-IMPORTS   = shell32 user32 kernel32
+APPMODE   = -mconsole
+IMPORTS   = shell32
 
 C_SRCS = start.c
 

programs/uninstaller/Makefile.in

@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = uninstaller.exe
-APPMODE   = cui
-IMPORTS   = user32 gdi32 advapi32 kernel32
+APPMODE   = -mconsole
+IMPORTS   = gdi32
 
 C_SRCS = \
 	main.c

programs/view/Makefile.in

@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = view.exe
-APPMODE   = gui
-IMPORTS   = comdlg32 user32 gdi32 kernel32
+APPMODE   = -mwindows
 
 C_SRCS = \
 	init.c \

programs/wcmd/Makefile.in

@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wcmd.exe
-APPMODE   = cui
-IMPORTS   = shell32 user32 kernel32
+APPMODE   = -mconsole
+IMPORTS   = shell32
 
 C_SRCS = \
 	batch.c \

programs/wineboot/Makefile.in

@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineboot.exe
-APPMODE   = cui
-IMPORTS   = advapi32 kernel32
+APPMODE   = -mconsole
 
 C_SRCS = \
 	wineboot.c

programs/winebrowser/Makefile.in

@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winebrowser.exe
-APPMODE   = cui
-IMPORTS   = shell32 user32 advapi32 kernel32
+APPMODE   = -mconsole
+IMPORTS   = shell32
 
 C_SRCS = \
 	main.c

programs/winecfg/Makefile.in

@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winecfg.exe
-APPMODE   = gui
-IMPORTS   = comdlg32 comctl32 user32 advapi32
+APPMODE   = -mwindows
+IMPORTS   = comctl32
 
 C_SRCS = \
 	appdefaults.c \

programs/wineconsole/Makefile.in

@@ -4,8 +4,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineconsole.exe
-APPMODE   = gui
-IMPORTS   = advapi32 kernel32 ntdll
+APPMODE   = -mwindows
+IMPORTS   = ntdll
 DELAYIMPORTS = comctl32 user32 gdi32
 
 C_SRCS = \

programs/winedbg/Makefile.in

@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winedbg.exe
-APPMODE   = cui
-IMPORTS   = advapi32 kernel32 ntdll
+APPMODE   = -mconsole
+IMPORTS   = ntdll
 DELAYIMPORTS = user32
 
 C_SRCS = \

programs/winefile/Makefile.in

@@ -4,8 +4,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winefile.exe
-APPMODE   = gui
-IMPORTS   = shell32 comctl32 ole32 user32 gdi32 kernel32
+APPMODE   = -mwindows
+IMPORTS   = comctl32 ole32
 EXTRALIBS = -luuid
 
 C_SRCS = \

programs/winemenubuilder/Makefile.in

@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winemenubuilder.exe
-APPMODE   = gui
-IMPORTS   = shell32 ole32 user32 advapi32 kernel32
+APPMODE   = -mwindows
+IMPORTS   = ole32
 EXTRALIBS = -luuid
 
 C_SRCS = \

programs/winemine/Makefile.in

@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winemine.exe
-APPMODE   = gui
-IMPORTS   = user32 gdi32 advapi32 kernel32
+APPMODE   = -mwindows
 
 C_SRCS = \
         dialog.c \

programs/winepath/Makefile.in

@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winepath.exe
-APPMODE   = cui
-IMPORTS   = kernel32
+APPMODE   = -mconsole
 
 C_SRCS = winepath.c
 

programs/winetest/Makefile.in

@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winetest.exe
-APPMODE   = gui
-IMPORTS   = comctl32 user32 wsock32
+APPMODE   = -mwindows
+IMPORTS   = comctl32 wsock32
 
 C_SRCS = \
 	gui.c \

programs/winevdm/Makefile.in

@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winevdm.exe
-APPMODE   = cui
-IMPORTS   = winedos kernel32
+APPMODE   = -mconsole
+IMPORTS   = winedos
 
 C_SRCS = \
 	winevdm.c

programs/winhelp/Makefile.in

@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winhelp.exe
-APPMODE   = gui
-IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32
+APPMODE   = -mwindows
 PROGRAMS  = hlp2sgml
 
 C_SRCS = \

programs/winver/Makefile.in

@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winver.exe
-APPMODE   = gui
-IMPORTS   = shell32 kernel32
+APPMODE   = -mwindows
 
 C_SRCS = winver.c