--- a/bc.mak Fri Jan 20 12:23:16 2012 +0100
+++ b/bc.mak Fri Jan 20 12:23:20 2012 +0100
@@ -1,11 +1,17 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_projects_smalltalk at 2012-01-13 13:03:58.273.
+# automagically generated from the projectDefinition: stx_projects_smalltalk at 2012-01-20 12:23:14.604.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
#
+# Historic Note:
+# this used to contain only rules to make with borland
+# (called via bmake, by "make.exe -f bc.mak")
+# this has changed; it is now also possible to build using microsoft visual c
+# (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
+#
TOP=..\..
INCLUDE_TOP=$(TOP)\..
@@ -55,13 +61,21 @@
LINKER=$(BCB)\BIN\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
+OBJDIR=objbc
+LIBDIR=libbc
+USE_ARG=-DUSEBC
+!else
+! ifdef USEVC
LINKER = $(LINK32)
CRT_STARTUP=
RT_LIB =
LFLAGS = /nologo /DEBUG /DYNAMICBASE:NO /MACHINE:X86 /ERRORREPORT:PROMPT
+OBJDIR=objvc
+LIBDIR=libvc
+USE_ARG=-DUSEVC
+! else
+error error
+! endif
!endif
PROJECT_NOCONSOLE = stx.exe
@@ -71,18 +85,14 @@
ALLOBJ = $(CRT_STARTUP) $(ALLOBJFILES) $(OBJS)
DEFFILE=$(TOP)\rules\bc_exe.def
+LIBFILES=$(TOP)\$(LIBDIR)\librun.lib
+
!ifdef USEBC
-LIBFILES=$(TOP)\libbc\librun.lib
ALLLIB=$(LIBFILES) import32.lib $(RT_LIB)
-USE_ARG=-DUSEBC
-!else
-! ifdef USEVC
-LIBFILES=$(TOP)\libvc\librun.lib
+!endif
+
+!ifdef USEVC
ALLLIB=$(LIBFILES) kernel32.lib
-USE_ARG=-DUSEVC
-! else
-error error
-! endif
!endif
REQUIRED_LIBS=librun.dll \
@@ -510,8 +520,8 @@
buildDate.h: $(TOP)\librun\genDate.exe
$(TOP)\librun\genDate.exe
-librun.dll: $(TOP)\librun\librun.dll
- copy $(TOP)\librun\librun.dll librun.dll
+librun.dll: $(TOP)\librun\$(OBJDIR)\librun.dll
+ copy $(TOP)\librun\$(OBJDIR)\librun.dll librun.dll
cs3245.dll: $(TOP)\support\win32\borland\cs3245.dll
copy $(TOP)\support\win32\borland\cs3245.dll cs3245.dll