--- a/bc.mak Tue Sep 27 19:36:43 2011 +0200
+++ b/bc.mak Tue Sep 27 19:36:47 2011 +0200
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_projects_smalltalk.
+# automagically generated from the projectDefinition: stx_projects_smalltalk at 2011-09-27 19:36:42.643.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -10,9 +10,10 @@
TOP=..\..
INCLUDE_TOP=$(TOP)\..
+!ifdef USEBC
+
# 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
CFLAGS_NOCONSOLE=-tWR -D_NO_VCL;WIN32GUI;WIN32
LFLAGS_CONSOLE=-ap
@@ -20,6 +21,8 @@
CRT_STARTUP_CONSOLE=c0x32.obj
CRT_STARTUP_NOCONSOLE=c0w32.obj
+!endif
+
CFLAGS_LOCAL=$(CFLAGS_APPTYPE) \
-DSTARTUP_CLASS="\"Smalltalk\"" \
-DSTARTUP_SELECTOR="\"start\"" \
@@ -43,11 +46,18 @@
STCLOCALOPT='-package=$(PACKAGE)' $(LOCALDEFINES) $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMFLAG) -varPrefix=$(LIBNAME)
+!ifdef USEBC
LINKER = ilink32
# 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
+!endif
+
+!ifdef USEVC
+LINKER = $(LINK32)
+!endif
+
PROJECT_NOCONSOLE = stx.exe
PROJECT_CONSOLE = stx.com
ALLOBJFILES = main.obj
@@ -95,11 +105,22 @@
exe: newBuildDate noConsoleApp consoleApp $(REQUIRED_SUPPORT_DIRS)
+!ifdef USEBC
+USE_ARG=-DUSEBC
+!else
+! ifdef USEVC
+USE_ARG=-DUSEVC
+! else
+error error
+! endif
+!endif
+
# the executable only
# with console
consoleApp: $(REQUIRED_LIBS)
-del main.obj
$(MAKE) -N -f bc.mak \
+ $(USE_ARG) \
MAKE_BAT=$(MAKE_BAT) \
PROJECT=$(PROJECT_CONSOLE) \
CFLAGS_APPTYPE="$(CFLAGS_CONSOLE)" \
@@ -110,6 +131,7 @@
noConsoleApp: $(REQUIRED_LIBS)
-del main.obj
$(MAKE) -N -f bc.mak \
+ $(USE_ARG) \
MAKE_BAT=$(MAKE_BAT) \
PROJECT=$(PROJECT_NOCONSOLE) \
CFLAGS_APPTYPE="$(CFLAGS_NOCONSOLE) -DWIN_LOGFILE="\\"\"smalltalk.log\\"\""" \
@@ -480,6 +502,7 @@
+
clean::
-del genDate.exe
-del c0x32.dll