--- a/LibraryDefinition.st Thu Jan 11 18:09:17 2007 +0100
+++ b/LibraryDefinition.st Thu Jan 11 19:06:00 2007 +0100
@@ -80,10 +80,7 @@
#('Make.spec' #'generate_make_dot_spec')
#('libInit.cc' #'generate_libInit_dot_cc')
#('bc.def' #'generate_bc_dot_def')
- #('nt.mak' #'generate_nt_dot_mak')
-"
- #('nt.def' #'generate_nt_dot_def')
-"
+ #('bc.mak' #'generate_bc_dot_mak')
#('abbrev.stc' #'generate_abbrev_dot_stc')
#('bmake.bat' #'generate_bmake_dot_mak')
) , (Array
@@ -144,6 +141,59 @@
"Modified: / 18-08-2006 / 17:13:45 / cg"
!
+bc_dot_mak
+
+^
+'# $','Header','$
+#
+# DO NOT EDIT
+# automagically generated from the projectDefinition: ',self name,'.
+#
+# Warning: once you modify this file, do not rerun
+# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
+#
+# This file contains make rules for the win32 platform (using borland-bcc).
+# It shares common definitions with the unix-make in Make.spec.
+# The nt.mak supports the following targets:
+# bmake - compile all st-files to a classLib (dll)
+# bmake clean - clean all temp files
+# bmake clobber - clean all
+#
+#
+TOP=%(TOP)
+INCLUDE_TOP=$(TOP)\..
+
+!!INCLUDE $(TOP)\rules\stdHeader_bc
+
+!!INCLUDE Make.spec
+
+LIBNAME=%(LIBRARY_NAME)
+RESFILES=%(RESFILENAME)
+LOCALINCLUDES=%(LOCAL_INCLUDES)
+
+STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) %(HEADEROUTPUTARG) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) %(COMMONSYMFLAG) -varPrefix=$(LIBNAME)
+LOCALLIBS=%(ADDITIONAL_LINK_LIBRARIES)
+
+%(ADDITIONAL_DEFINITIONS)
+
+OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
+
+ALL:: %(ADDITIONAL_TARGETS) $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
+
+!!INCLUDE $(TOP)\rules\stdRules_bc
+
+%(ADDITIONAL_RULES)
+
+# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+%(DEPENDENCIES)
+# ENDMAKEDEPEND --- do not remove this line
+'
+
+ "Created: / 09-08-2006 / 11:44:20 / fm"
+ "Modified: / 09-08-2006 / 19:59:32 / fm"
+ "Modified: / 14-09-2006 / 15:48:18 / cg"
+!
+
extensionLine_libInit_dot_cc
^'_%(LIBRARY_NAME)_extensions_Init(pass,__pRT__,snd);'
@@ -365,7 +415,7 @@
"Modified: / 14-09-2006 / 15:48:02 / cg"
!
-nt_dot_def
+vc_dot_def
^
'LIBRARY %(LIBRARY_NAME)
@@ -381,59 +431,6 @@
IMPORTS'
"Modified: / 08-08-2006 / 19:33:14 / fm"
-!
-
-nt_dot_mak
-
-^
-'# $','Header','$
-#
-# DO NOT EDIT
-# automagically generated from the projectDefinition: ',self name,'.
-#
-# Warning: once you modify this file, do not rerun
-# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
-#
-# This file contains make rules for the win32 platform (using borland-bcc).
-# It shares common definitions with the unix-make in Make.spec.
-# The nt.mak supports the following targets:
-# bmake - compile all st-files to a classLib (dll)
-# bmake clean - clean all temp files
-# bmake clobber - clean all
-#
-#
-TOP=%(TOP)
-INCLUDE_TOP=$(TOP)\..
-
-!!INCLUDE $(TOP)\rules\stdHeader_nt
-
-!!INCLUDE Make.spec
-
-LIBNAME=%(LIBRARY_NAME)
-RESFILES=%(RESFILENAME)
-LOCALINCLUDES=%(LOCAL_INCLUDES)
-
-STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) %(HEADEROUTPUTARG) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) %(COMMONSYMFLAG) -varPrefix=$(LIBNAME)
-LOCALLIBS=%(ADDITIONAL_LINK_LIBRARIES)
-
-%(ADDITIONAL_DEFINITIONS)
-
-OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
-
-ALL:: %(ADDITIONAL_TARGETS) $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
-
-!!INCLUDE $(TOP)\rules\stdRules_nt
-
-%(ADDITIONAL_RULES)
-
-# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-%(DEPENDENCIES)
-# ENDMAKEDEPEND --- do not remove this line
-'
-
- "Created: / 09-08-2006 / 11:44:20 / fm"
- "Modified: / 09-08-2006 / 19:59:32 / fm"
- "Modified: / 14-09-2006 / 15:48:18 / cg"
! !
!LibraryDefinition class methodsFor:'mappings'!
@@ -448,6 +445,30 @@
"Modified: / 14-09-2006 / 18:56:11 / cg"
!
+bc_dot_mak_mappings
+ |d resFileName|
+
+ resFileName := (self package copyFrom:(self package lastIndexOfAny:':/')+1),'.res'.
+
+ d := super bc_dot_mak_mappings.
+ d
+ at: 'LIBRARY_NAME' put: ( self libraryName );
+ at: 'LOCAL_INCLUDES' put: (self generateLocalIncludes_win32);
+ at: 'COMMONSYMFLAG' put: (self commonSymbolsFlag);
+ at: 'HEADEROUTPUTARG' put: (self headerFileOutputArg);
+ at: 'RESFILENAME' put: resFileName;
+ at: 'ADDITIONAL_DEFINITIONS' put: (self additionalDefinitions_bc_dot_mak);
+ at: 'ADDITIONAL_RULES' put: (self additionalRules_bc_dot_mak);
+ at: 'ADDITIONAL_TARGETS' put: (self additionalTargets_bc_dot_mak);
+ at: 'DEPENDENCIES' put: (self generateDependencies_win32);
+ yourself.
+ ^ d.
+
+ "Created: / 09-08-2006 / 11:44:36 / fm"
+ "Modified: / 09-08-2006 / 20:00:01 / fm"
+ "Modified: / 14-09-2006 / 18:58:15 / cg"
+!
+
extensionLine_libInit_dot_cc_mappings
^Dictionary new
@@ -473,7 +494,7 @@
"Modified: / 14-09-2006 / 18:56:42 / cg"
!
-nt_dot_def_mappings
+vc_dot_def_mappings
^Dictionary new
at: 'LIBRARY_NAME' put: (self libraryName);
@@ -483,30 +504,6 @@
"Created: / 09-08-2006 / 11:21:21 / fm"
"Modified: / 14-09-2006 / 18:58:07 / cg"
-!
-
-nt_dot_mak_mappings
- |d resFileName|
-
- resFileName := (self package copyFrom:(self package lastIndexOfAny:':/')+1),'.res'.
-
- d := super nt_dot_mak_mappings.
- d
- at: 'LIBRARY_NAME' put: ( self libraryName );
- at: 'LOCAL_INCLUDES' put: (self generateLocalIncludes_win32);
- at: 'COMMONSYMFLAG' put: (self commonSymbolsFlag);
- at: 'HEADEROUTPUTARG' put: (self headerFileOutputArg);
- at: 'RESFILENAME' put: resFileName;
- at: 'ADDITIONAL_DEFINITIONS' put: (self additionalDefinitions_nt_dot_mak);
- at: 'ADDITIONAL_RULES' put: (self additionalRules_nt_dot_mak);
- at: 'ADDITIONAL_TARGETS' put: (self additionalTargets_nt_dot_mak);
- at: 'DEPENDENCIES' put: (self generateDependencies_win32);
- yourself.
- ^ d.
-
- "Created: / 09-08-2006 / 11:44:36 / fm"
- "Modified: / 09-08-2006 / 20:00:01 / fm"
- "Modified: / 14-09-2006 / 18:58:15 / cg"
! !
!LibraryDefinition class methodsFor:'mappings support'!
@@ -628,5 +625,5 @@
!LibraryDefinition class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/LibraryDefinition.st,v 1.73 2007-01-10 13:16:23 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/LibraryDefinition.st,v 1.74 2007-01-11 18:06:00 stefan Exp $'
! !