--- a/bc.mak	Wed Feb 28 15:59:10 2007 +0100
+++ b/bc.mak	Wed Feb 28 16:37:20 2007 +0100
@@ -1,28 +1,30 @@
 # $Header$
 #
-# DO NOT EDIT 
+# DO NOT EDIT
 # automagically generated from the projectDefinition: stx_projects_smalltalk.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
 #
 
-TOP=..\..       
+TOP=..\..
 INCLUDE_TOP=$(TOP)\..
 
 # 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
 LFLAGS_CONSOLE=-ap
 LFLAGS_NOCONSOLE=-aa
 CRT_STARTUP_CONSOLE=c0x32.obj
 CRT_STARTUP_NOCONSOLE=c0w32.obj
 
-CFLAGS_APPTYPE=$(CFLAGS_CONSOLE)
-LFLAGS_APPTYPE=$(LFLAGS_CONSOLE)
-CRT_STARTUP=$(CRT_STARTUP_CONSOLE)
+# notice: the following 3 are now defined via the make-stx and make-winstx rules.
+#
+# CFLAGS_APPTYPE=$(CFLAGS_CONSOLE)
+# LFLAGS_APPTYPE=$(LFLAGS_CONSOLE)
+# CRT_STARTUP=$(CRT_STARTUP_CONSOLE)
 
 CFLAGS_LOCAL=$(CFLAGS_APPTYPE) \
  -DSTARTUP_CLASS="\"Smalltalk\"" \
@@ -47,7 +49,7 @@
 # LFLAGS = -L$(TOP)\libbc;$(BCB)\lib;$(DEBUGLIBPATH) -H:0x400000 -Hc:0x100000 -S:0x40000 -Sc:0x10000 -ap -Tpe -x -Gn -v -Ao:0x10000
 LFLAGS = -L$(TOP)\libbc;$(BCB)\lib -S:0x40000 -Sc:0x10000 $(LFLAGS_APPTYPE) -Tpe -x -Gn -v -Ao:0x10000
 
-PROJECT = stx.exe
+# PROJECT = stx.exe
 ALLOBJFILES = main.obj
 RESFILES = smalltalkWinRC.res
 ALLOBJ = $(CRT_STARTUP) $(ALLOBJFILES) $(OBJS)
@@ -81,13 +83,30 @@
 
 REQUIRED_SUPPORT_DIRS=
 
-target: exe winstx
+target: stx winstx
 
-# the executable, all required files and a self-installing-installer-exe
-ALL:: exe $(REQUIRED_SUPPORT_DIRS) setup
+# the executables, all required files and a self-installing-installer-exe
+ALL:: stx winstx $(REQUIRED_SUPPORT_DIRS) setup
 
 # the executable only
-exe: $(OUTDIR) $(OBJS) $(REQUIRED_FILES) show $(PROJECT) 
+stx:
+	-del main.obj
+	$(MAKE) -N -f bc.mak \
+		PROJECT=stx.exe \
+		CFLAGS_APPTYPE="$(CFLAGS_CONSOLE)" \
+		LFLAGS_APPTYPE="$(LFLAGS_CONSOLE)" \
+		CRT_STARTUP="$(CRT_STARTUP_CONSOLE)"  exe
+
+winstx:
+	-del main.obj
+	$(MAKE) -N -f bc.mak \
+		PROJECT=winstx.exe \
+		CFLAGS_APPTYPE="$(CFLAGS_NOCONSOLE) -DWIN_LOGFILE="\\"\"stx_%%d.log\\"\""" \
+		LFLAGS_APPTYPE="$(LFLAGS_NOCONSOLE)" \
+		CRT_STARTUP="$(CRT_STARTUP_NOCONSOLE)"  exe
+
+exe: $(OUTDIR) $(OBJS) $(REQUIRED_FILES) show $(PROJECT)
+
 
 # a nullsoft installable delivery
 setup: install_stx.exe
@@ -251,7 +270,7 @@
 	bmake
 	cd ..\..\..\stx\projects\smalltalk
 
-      
+
 
 
 show:
@@ -262,8 +281,11 @@
     @echo DEFFILE= $(DEFFILE)
     @echo ALLRES= $(ALLRES)
 
-$(PROJECT): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE)
-    $(BCB)\BIN\$(LINKER) $(LFLAGS) $(ALLOBJ), $(PROJECT),,  $(ALLLIB),  $(DEFFILE),  $(RESFILES)
+stx.exe: $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) $(LFLAGS) $(ALLOBJ), stx.exe,,  $(ALLLIB),  $(DEFFILE),  $(RESFILES)
+
+winstx.exe: $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) $(LFLAGS) $(ALLOBJ), winstx.exe,,  $(ALLLIB),  $(DEFFILE),  $(RESFILES)
 
 #$(PROJECT): $(ALLOBJFILES) $(RESFILES) $(DEFFILE)
 #    $(BCB)\BIN\$(LINKER) @&&!
@@ -304,10 +326,6 @@
 	-del librun.dll
 
 
-winstx:
-	$(MAKE) -N -f bc.mak -DNOCONSOLE PROJECT=winstx.exe winstx.exe 
-
-
 clean::
 	-del genDate.exe
 	-del c0x32.dll