--- a/ApplicationDefinition.st	Thu Jan 19 11:46:00 2012 +0000
+++ b/ApplicationDefinition.st	Sun Jan 22 23:07:15 2012 +0000
@@ -1534,6 +1534,12 @@
 # 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")
+#
 
 !!ifndef USEBC
 !! ifndef USEVC
@@ -1586,16 +1592,26 @@
 STCLOCALOPT=''-package=$(PACKAGE)'' $(LOCALDEFINES) $(LOCALINCLUDES) %(HEADEROUTPUTARG) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMFLAG) -varPrefix=$(LIBNAME)
 
 !!ifdef USEBC
+OBJDIR=objbc
+LIBDIR=libbc
+
 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
+# LFLAGS = -L$(TOP)\$(LIBDIR);$(BCB)\lib;$(DEBUGLIBPATH) -H:0x400000 -Hc:0x100000 -S:0x40000 -Sc:0x10000 -ap -Tpe -x -Gn -v -Ao:0x10000
+LFLAGS = -L$(TOP)\$(LIBDIR);$(BCB)\lib -S:0x40000 -Sc:0x10000 $(LFLAGS_APPTYPE) -Tpe -x -Gn -v -Ao:0x10000
+USE_ARG=-DUSEBC
+!!else
+!! ifdef USEVC
+OBJDIR=objvc
+LIBDIR=libvc
+
 LINKER = $(LINK32)
 CRT_STARTUP=
 RT_LIB =
 LFLAGS = /nologo /DEBUG /DYNAMICBASE:NO /MACHINE:X86 /ERRORREPORT:PROMPT
+USE_ARG=-DUSEVC
+!! else
+error error
+!! endif
 !!endif
 
 PROJECT_NOCONSOLE = %(NOCONSOLE_APPLICATION)
@@ -1605,18 +1621,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 %(REQUIRED_LIBS)
@@ -1739,8 +1751,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
@@ -1773,7 +1785,7 @@
         -del *.log
         -del *.res
         -rmdir /S /Q resources
-        -rmdir /S /Q objbc
+        -rmdir /S /Q $(OBJDIR)
 
 clobber:: clean
         -del *.dll *.exe *.com
@@ -1787,7 +1799,7 @@
 # ENDMAKEDEPEND --- do not remove this line
 '.
 
-    "Modified: / 28-09-2011 / 16:37:33 / cg"
+    "Modified: / 20-01-2012 / 13:56:17 / cg"
     "Modified: / 28-09-2011 / 13:30:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
@@ -2836,18 +2848,19 @@
 !ApplicationDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.188 2011/12/23 14:09:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.190 2012/01/20 12:56:44 cg Exp $'
 !
 
 version_CVS
-    ^ 'Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.188 2011/12/23 14:09:06 cg Exp '
+    ^ 'Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.190 2012/01/20 12:56:44 cg Exp '
 !
 
 version_SVN
-    ^ '$Id: ApplicationDefinition.st 10761 2012-01-19 11:46:00Z vranyj1 $'
+    ^ '$Id: ApplicationDefinition.st 10763 2012-01-22 23:07:15Z vranyj1 $'
 ! !
 
 
 
 
 
+