--- a/bc.mak	Fri Jan 12 15:50:39 2007 +0100
+++ b/bc.mak	Fri Jan 12 17:53:13 2007 +0100
@@ -13,17 +13,23 @@
 # CFLAGS1= -WD -w-pro -w-ccc -w-rch -w-aus -w-par -x- -r- -k -y -v -vi- -c -tWDR
 CFLAGS1= -w-pro -w-ccc -w-rch -w-aus -w-par -x- -r- -k -y -v -vi- -c
 
-CFLAGS_CONSOLE= -tWC -tWR -D_NO_VCL;WIN32 -DWIN_LOGFILE="\"stx_%d.log\""
-CFLAGS_NOCONSOLE=-tWR -D_NO_VCL;WIN32GUI;WIN32 -DWIN_LOGFILE="\"stx_%d.log\""
+CFLAGS_CONSOLE= -tWC -tWR -D_NO_VCL;WIN32
+CFLAGS_NOCONSOLE=-tWR -D_NO_VCL;WIN32GUI;WIN32 -DWIN_LOGFILE="\"stx_%%d.log\""
 LFLAGS_CONSOLE=-ap
 LFLAGS_NOCONSOLE=-aa
 CRT_STARTUP_CONSOLE=c0x32.obj
 CRT_STARTUP_NOCONSOLE=c0w32.obj
 
-!ifndef CFLAG_APPTYPE
-CFLAGS_APPTYPE=$(CFLAGS_CONSOLE)
+!ifdef NOCONSOLE
+CFLAGS_APPTYPE= $(CFLAGS_NOCONSOLE)
+LFLAGS_APPTYPE=$(LFLAGS_NOCONSOLE)
+CRT_STARTUP=$(CRT_STARTUP_NOCONSOLE)
+ALLOBJFILES = winmain.obj
+!else
+CFLAGS_APPTYPE= $(CFLAGS_CONSOLE)
 LFLAGS_APPTYPE=$(LFLAGS_CONSOLE)
 CRT_STARTUP=$(CRT_STARTUP_CONSOLE)
+ALLOBJFILES = main.obj
 !endif
 
 CFLAGS_LOCAL=$(CFLAGS_APPTYPE) \
@@ -53,7 +59,7 @@
 PROJECT = stx.exe
 !endif
 
-ALLOBJFILES = main.obj
+
 RESFILES = smalltalkWinRC.res
 ALLOBJ = $(CRT_STARTUP) $(ALLOBJFILES) $(OBJS)
 DEFFILE=bc.def
@@ -177,7 +183,7 @@
     @echo DEFFILE= $(DEFFILE)
     @echo ALLRES= $(ALLRES)
 
-$(PROJECT): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE)
+$(PROJECT): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(REQUIRED_LIBS)
     $(BCB)\BIN\$(LINKER) $(LFLAGS) $(ALLOBJ), $(PROJECT),,  $(ALLLIB),  $(DEFFILE),  $(RESFILES)
 
 #$(PROJECT): $(ALLOBJFILES) $(RESFILES) $(DEFFILE)
@@ -200,6 +206,11 @@
 
 main.obj: buildDate.h main.c bc.mak
 
+winmain.obj: buildDate.h main.c bc.mak
+	$(CC) $(STX_INCL) $(SYS_INCL) $(FFLAGS) $(DEFS) \
+		$(COPTFLAGS) $(DBGFLAGS) $(CFLAGS) -c -o$*.obj main.c
+	
+
 main.c: $(TOP)\librun\main.c
 	copy $(TOP)\librun\main.c main.c
 
@@ -220,8 +231,7 @@
 
 
 winstx:
-	$(MAKE) -N -f bc.mak CFLAGS_APPTYPE="$(CFLAGS_NOCONSOLE)" LFLAGS_APPTYPE="$(LFLAGS_NOCONSOLE)" \ 	
-		CRT_STARTUP="$(CRT_STARTUP_NOCONSOLE)" PROJECT=winstx.exe winstx.exe 
+	$(MAKE) -N -f bc.mak -DNOCONSOLE PROJECT=winstx.exe winstx.exe