--- a/LibraryDefinition.st	Fri Aug 18 13:56:00 2006 +0200
+++ b/LibraryDefinition.st	Fri Aug 18 15:42:15 2006 +0200
@@ -72,6 +72,21 @@
      )
 
     "Modified: / 17-08-2006 / 20:03:00 / cg"
+!
+
+generate_libInit_dot_cc
+
+    ^self replaceMappings: self libInit_dot_cc_mappings 
+            in: self libInit_dot_cc
+
+"
+  DapasXProject generate_libInit_dot_cc
+  DapasX_Datenbasis generate_libInit_dot_cc
+
+"
+
+    "Created: / 08-08-2006 / 12:47:16 / fm"
+    "Modified: / 09-08-2006 / 11:30:52 / fm"
 ! !
 
 !LibraryDefinition class methodsFor:'file templates'!
@@ -258,6 +273,7 @@
 #  (i.e. NEVER for those which are subject to dynamic loading).
 # COMMONSYMFLAG=$(COMMONSYMBOLS)
 #
+PACKAGE=$(MODULE):$(MODULE_DIR)
 STCLOCALOPT=-I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -H. ''-P$(PACKAGE)'' ''-Z$(LIBNAME)'' $(COMMONSYMFLAG) $(INITCODESEPFLAG)
 
 
@@ -331,7 +347,7 @@
 
     "Created: / 08-08-2006 / 20:45:36 / fm"
     "Modified: / 09-08-2006 / 16:50:23 / fm"
-    "Modified: / 18-08-2006 / 12:57:19 / cg"
+    "Modified: / 18-08-2006 / 15:32:40 / cg"
 !
 
 make_dot_spec
@@ -354,7 +370,6 @@
 MODULE=%(MODULE)
 MODULE_DIR=%(MODULE_DIRECTORY)
 LIBNAME=%(LIBRARY_NAME)
-PACKAGE=$(MODULE):$(MODULE_DIR)
 
 
 # Argument(s) to the stc compiler (stc --usage).
@@ -396,7 +411,7 @@
 
     "Created: / 08-08-2006 / 19:31:29 / fm"
     "Modified: / 09-08-2006 / 15:10:57 / fm"
-    "Modified: / 18-08-2006 / 12:56:33 / cg"
+    "Modified: / 18-08-2006 / 15:32:02 / cg"
 !
 
 nt_dot_def
@@ -438,6 +453,7 @@
 
 LOCALINCLUDES=%(LOCAL_INCLUDES)
 
+PACKAGE=$(MODULE):$(MODULE_DIR)
 STCLOCALOPT=-I. $(LOCALINCLUDES) -H. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) ''-P$(PACKAGE)'' ''-Z$(LIBNAME)'' $(COMMONSYMFLAG) $(INITCODESEPFLAG)
 RESFILENAME=$(LIBNAME).res
 RESFILES=%(RESFILENAME)
@@ -452,7 +468,7 @@
 
     "Created: / 09-08-2006 / 11:44:20 / fm"
     "Modified: / 09-08-2006 / 19:59:32 / fm"
-    "Modified: / 18-08-2006 / 12:57:32 / cg"
+    "Modified: / 18-08-2006 / 15:42:09 / cg"
 !
 
 objectLine_make_dot_spec
@@ -615,13 +631,23 @@
 
 generateClassLines_libInit_dot_cc
     ^ String streamContents:[:s |
-        self compiled_classNames do:[:className | 
-            |newClassLine mappings|
+        |putLineForClassName|
+
+        putLineForClassName := [:className | 
+                |newClassLine mappings|
 
-            mappings := self classLine_libInit_dot_cc_mappings: className.
-            newClassLine := self replaceMappings:mappings in:self classLine_libInit_dot_cc.
-            s nextPutLine: newClassLine 
-        ]
+                mappings := self classLine_libInit_dot_cc_mappings: className.
+                newClassLine := self replaceMappings:mappings in:self classLine_libInit_dot_cc.
+                s nextPutLine: newClassLine 
+            ].
+
+        self compiled_classNames do:putLineForClassName.
+        self compiled_classNames_unix notEmpty ifTrue:[
+            self compiled_classNames_unix do:putLineForClassName
+        ].
+        self compiled_classNames_windows notEmpty ifTrue:[
+            self compiled_classNames_windows do:putLineForClassName
+        ].
     ]
 
     "
@@ -632,7 +658,7 @@
 
     "Created: / 09-08-2006 / 11:21:48 / fm"
     "Modified: / 16-08-2006 / 18:52:10 / User"
-    "Modified: / 18-08-2006 / 11:59:44 / cg"
+    "Modified: / 18-08-2006 / 13:41:37 / cg"
 !
 
 generateExtensionLine_libInit_dot_cc
@@ -797,7 +823,7 @@
 autoloadedClassNames_code
     |compiled excluded|
 
-    compiled := self compiled_classNames.
+    compiled := self compiled_classNames , self compiled_classNames_windows , self compiled_classNames_unix.
     excluded := self excluded_classNames.
     ^ String streamContents:[:s |
         s nextPutLine:'autoloaded_classNames'.
@@ -821,6 +847,7 @@
     "
 
     "Created: / 17-08-2006 / 20:55:35 / cg"
+    "Modified: / 18-08-2006 / 13:38:37 / cg"
 !
 
 classNames_code
@@ -903,5 +930,5 @@
 !LibraryDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/LibraryDefinition.st,v 1.23 2006-08-18 11:07:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/LibraryDefinition.st,v 1.24 2006-08-18 13:42:15 cg Exp $'
 ! !