--- a/bc.mak Fri Jan 12 14:35:04 2007 +0100
+++ b/bc.mak Fri Jan 12 15:50:39 2007 +0100
@@ -20,9 +20,11 @@
CRT_STARTUP_CONSOLE=c0x32.obj
CRT_STARTUP_NOCONSOLE=c0w32.obj
+!ifndef CFLAG_APPTYPE
CFLAGS_APPTYPE=$(CFLAGS_CONSOLE)
LFLAGS_APPTYPE=$(LFLAGS_CONSOLE)
CRT_STARTUP=$(CRT_STARTUP_CONSOLE)
+!endif
CFLAGS_LOCAL=$(CFLAGS_APPTYPE) \
-DSTARTUP_CLASS="\"Smalltalk\"" \
@@ -47,7 +49,10 @@
# 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
+!ifndef PROJECT
PROJECT = stx.exe
+!endif
+
ALLOBJFILES = main.obj
RESFILES = smalltalkWinRC.res
ALLOBJ = $(CRT_STARTUP) $(ALLOBJFILES) $(OBJS)
@@ -81,7 +86,7 @@
REQUIRED_SUPPORT_DIRS=
-target: exe noConsoleStx
+target: exe winstx
# the executable, all required files and a self-installing-installer-exe
ALL:: exe $(REQUIRED_SUPPORT_DIRS) setup
@@ -214,8 +219,10 @@
-del librun.dll
-noConsoleStx:
- $(MAKE) CFLAGS_APPTYPE=$(CFLAGS_NOCONSOLE) LFLAGS_APPTYPE=$(LFLAGS_NOCONSOLE) CRT_STARTUP=$(CRT_STARTUP_NOCONSOLE) PROJECT=winstx.exe winstx.exe
+winstx:
+ $(MAKE) -N -f bc.mak CFLAGS_APPTYPE="$(CFLAGS_NOCONSOLE)" LFLAGS_APPTYPE="$(LFLAGS_NOCONSOLE)" \
+ CRT_STARTUP="$(CRT_STARTUP_NOCONSOLE)" PROJECT=winstx.exe winstx.exe
+
clean::