--- a/ProjectBuilder.st	Tue Sep 04 12:07:46 2012 +0200
+++ b/ProjectBuilder.st	Wed Sep 05 11:22:06 2012 +0200
@@ -267,7 +267,6 @@
 copyDLLsForLinkage
     |targetBuildDir preRequisites dllRelativeSourcePathes dllRelativeDestPathes|
 
-
     targetBuildDir := buildDirectory / package module / package directory.
 
     preRequisites := projectDefinitionClass allPreRequisites.
@@ -282,7 +281,7 @@
     preRequisites do:[:eachPackageToFileout |
         |packageId packageDef packageModule packageDirectory packageTargetDir
          dllSource dllSourceDir libraryName dllRelativePathSource 
-         dllRelativePathDest objDirSource objDirDest|
+         dllRelativePathDest objDirSource objDirDest alternativeObjDirSource|
 
         packageId := eachPackageToFileout asPackageId.
         packageModule := packageId module.
@@ -297,12 +296,20 @@
 
         OperatingSystem isMSWINDOWSlike ifTrue:[
             objDirDest := self objDirForUsedCompiler:usedCompiler.
-            "/ use visual-c files for tcc linkage
-            usedCompiler = 'tcc' ifTrue:[
-                objDirSource := self objDirForUsedCompiler:'vc'.
-            ] ifFalse:[
-                objDirSource := objDirDest
+            objDirSource := objDirDest.
+"/            "/ use visual-c files for tcc linkage
+"/            usedCompiler = 'tcc' ifTrue:[
+"/                objDirSource := self objDirForUsedCompiler:'vc'.
+"/            ] ifFalse:[
+"/                objDirSource := objDirDest
+"/            ].
+            (dllSourceDir / objDirSource / (libraryName, '.dll')) exists ifFalse:[
+                alternativeObjDirSource := self objDirForUsedCompiler:'vc'.
+                (dllSourceDir / alternativeObjDirSource / (libraryName, '.dll')) exists ifTrue:[
+                    objDirSource := alternativeObjDirSource
+                ]
             ].
+
 "/            dllRelativePath := objDir,'/',(libraryName,'.dll').
 "/            (dllSourceDir / dllRelativePath) exists 
             dllRelativeSourcePathes := Array with:(objDirSource,'\', libraryName, '.dll').
@@ -330,7 +337,7 @@
         ].
     ].
 
-    "Modified: / 04-09-2012 / 00:30:21 / cg"
+    "Modified: / 05-09-2012 / 08:27:07 / cg"
 !
 
 copyDirectory:relativepath
@@ -493,20 +500,26 @@
                         'support/win32/borland/cs3245.dll' 
                         'support/win32/X11.dll'
                         'support/win32/Xext.dll'
-                        'lib_bc/librun.lib'
-                        'lib_bc/cs32i.lib'
+                        'lib/bc/librun.lib'
+                        'lib/bc/cs32i.lib'
                     ).
         ].
         usedCompiler = 'vc' ifTrue:[
             files := files , #( 
                         'librun/objvc/librun.dll'
-                        'lib_vc/librun.lib'
+                        'lib/vc/librun.lib'
                     ).
         ].
         usedCompiler = 'tcc' ifTrue:[
             files := files , #( 
-                        'librun/objvc/librun.dll'
-                        'lib_vc/librun.lib'
+                        'librun/objvc/librun.dll'   "/ linkage is against vc version!!
+                        'lib/vc/librun.lib'
+                    ).
+        ].
+        usedCompiler = 'lcc' ifTrue:[
+            files := files , #( 
+                        'librun/objvc/librun.dll'   "/ linkage is against vc version!!
+                        'lib/vc/librun.lib'
                     ).
         ].
     ] ifFalse:[
@@ -541,7 +554,7 @@
         ].
     ].
 
-    "Modified: / 04-09-2012 / 11:59:53 / cg"
+    "Modified (comment): / 05-09-2012 / 10:29:28 / cg"
 !
 
 createHeaderFileFor:aClass in:packageTargetDir