changed: #bc_dot_mak
authorClaus Gittinger <cg@exept.de>
Tue, 27 Sep 2011 19:36:28 +0200
changeset 13733 c754bc40cc1c
parent 13732 72c921bb9eea
child 13734 e4a151f35857
changed: #bc_dot_mak
ApplicationDefinition.st
--- a/ApplicationDefinition.st	Tue Sep 27 19:36:26 2011 +0200
+++ b/ApplicationDefinition.st	Tue Sep 27 19:36:28 2011 +0200
@@ -1529,7 +1529,7 @@
 ^ '# $','Header','$
 #
 # DO NOT EDIT 
-# automagically generated from the projectDefinition: ',self name,'.
+# automagically generated from the projectDefinition: ',self name,' at ',Timestamp now printString,'.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -1538,9 +1538,10 @@
 TOP=%(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
@@ -1548,6 +1549,8 @@
 CRT_STARTUP_CONSOLE=c0x32.obj
 CRT_STARTUP_NOCONSOLE=c0w32.obj
 
+!!endif
+
 CFLAGS_LOCAL=$(CFLAGS_APPTYPE) \
  -DSTARTUP_CLASS="\"%(STARTUP_CLASS)\"" \
  -DSTARTUP_SELECTOR="\"%(STARTUP_SELECTOR)\"" \
@@ -1571,11 +1574,18 @@
 
 STCLOCALOPT=''-package=$(PACKAGE)'' $(LOCALDEFINES) $(LOCALINCLUDES) %(HEADEROUTPUTARG) $(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 = %(NOCONSOLE_APPLICATION)
 PROJECT_CONSOLE = %(CONSOLE_APPLICATION)
 ALLOBJFILES = main.obj
@@ -1753,7 +1763,7 @@
 # ENDMAKEDEPEND --- do not remove this line
 '.
 
-    "Modified: / 27-09-2011 / 19:22:28 / cg"
+    "Modified: / 27-09-2011 / 19:33:06 / cg"
 !
 
 bc_dot_mak_app_source_rules
@@ -2053,6 +2063,8 @@
 ^
 '# $','Header','$
 #
+# automagically generated from the projectDefinition: ',self name,' at ',Timestamp now printString,'.
+#
 # -------------- no need to change anything below ----------
 #
 # This makefile generates some standalone demo applications
@@ -2175,7 +2187,7 @@
     "Modified: / 09-08-2006 / 16:50:23 / fm"
     "Created: / 29-09-2006 / 23:47:07 / cg"
     "Modified: / 24-06-2009 / 21:40:26 / Jan Vrany <vranyj1@fel.cvut.cz>"
-    "Modified: / 12-09-2011 / 15:45:32 / cg"
+    "Modified: / 27-09-2011 / 19:34:12 / cg"
 !
 
 make_dot_proto_app_source_rules
@@ -2795,11 +2807,11 @@
 !ApplicationDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.182 2011-09-27 17:22:34 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.183 2011-09-27 17:36:28 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.182 2011-09-27 17:22:34 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.183 2011-09-27 17:36:28 cg Exp $'
 !
 
 version_SVN