lcc support
authorClaus Gittinger <cg@exept.de>
Wed, 05 Sep 2012 11:22:06 +0200
changeset 291659c84eca29fd
parent 2915 e0da59b7e3c9
child 2917 086fcfdbd182
lcc support
ProjectBuilder.st
     1.1 --- a/ProjectBuilder.st	Tue Sep 04 12:07:46 2012 +0200
     1.2 +++ b/ProjectBuilder.st	Wed Sep 05 11:22:06 2012 +0200
     1.3 @@ -267,7 +267,6 @@
     1.4  copyDLLsForLinkage
     1.5      |targetBuildDir preRequisites dllRelativeSourcePathes dllRelativeDestPathes|
     1.6  
     1.7 -
     1.8      targetBuildDir := buildDirectory / package module / package directory.
     1.9  
    1.10      preRequisites := projectDefinitionClass allPreRequisites.
    1.11 @@ -282,7 +281,7 @@
    1.12      preRequisites do:[:eachPackageToFileout |
    1.13          |packageId packageDef packageModule packageDirectory packageTargetDir
    1.14           dllSource dllSourceDir libraryName dllRelativePathSource 
    1.15 -         dllRelativePathDest objDirSource objDirDest|
    1.16 +         dllRelativePathDest objDirSource objDirDest alternativeObjDirSource|
    1.17  
    1.18          packageId := eachPackageToFileout asPackageId.
    1.19          packageModule := packageId module.
    1.20 @@ -297,12 +296,20 @@
    1.21  
    1.22          OperatingSystem isMSWINDOWSlike ifTrue:[
    1.23              objDirDest := self objDirForUsedCompiler:usedCompiler.
    1.24 -            "/ use visual-c files for tcc linkage
    1.25 -            usedCompiler = 'tcc' ifTrue:[
    1.26 -                objDirSource := self objDirForUsedCompiler:'vc'.
    1.27 -            ] ifFalse:[
    1.28 -                objDirSource := objDirDest
    1.29 +            objDirSource := objDirDest.
    1.30 +"/            "/ use visual-c files for tcc linkage
    1.31 +"/            usedCompiler = 'tcc' ifTrue:[
    1.32 +"/                objDirSource := self objDirForUsedCompiler:'vc'.
    1.33 +"/            ] ifFalse:[
    1.34 +"/                objDirSource := objDirDest
    1.35 +"/            ].
    1.36 +            (dllSourceDir / objDirSource / (libraryName, '.dll')) exists ifFalse:[
    1.37 +                alternativeObjDirSource := self objDirForUsedCompiler:'vc'.
    1.38 +                (dllSourceDir / alternativeObjDirSource / (libraryName, '.dll')) exists ifTrue:[
    1.39 +                    objDirSource := alternativeObjDirSource
    1.40 +                ]
    1.41              ].
    1.42 +
    1.43  "/            dllRelativePath := objDir,'/',(libraryName,'.dll').
    1.44  "/            (dllSourceDir / dllRelativePath) exists 
    1.45              dllRelativeSourcePathes := Array with:(objDirSource,'\', libraryName, '.dll').
    1.46 @@ -330,7 +337,7 @@
    1.47          ].
    1.48      ].
    1.49  
    1.50 -    "Modified: / 04-09-2012 / 00:30:21 / cg"
    1.51 +    "Modified: / 05-09-2012 / 08:27:07 / cg"
    1.52  !
    1.53  
    1.54  copyDirectory:relativepath
    1.55 @@ -493,20 +500,26 @@
    1.56                          'support/win32/borland/cs3245.dll' 
    1.57                          'support/win32/X11.dll'
    1.58                          'support/win32/Xext.dll'
    1.59 -                        'lib_bc/librun.lib'
    1.60 -                        'lib_bc/cs32i.lib'
    1.61 +                        'lib/bc/librun.lib'
    1.62 +                        'lib/bc/cs32i.lib'
    1.63                      ).
    1.64          ].
    1.65          usedCompiler = 'vc' ifTrue:[
    1.66              files := files , #( 
    1.67                          'librun/objvc/librun.dll'
    1.68 -                        'lib_vc/librun.lib'
    1.69 +                        'lib/vc/librun.lib'
    1.70                      ).
    1.71          ].
    1.72          usedCompiler = 'tcc' ifTrue:[
    1.73              files := files , #( 
    1.74 -                        'librun/objvc/librun.dll'
    1.75 -                        'lib_vc/librun.lib'
    1.76 +                        'librun/objvc/librun.dll'   "/ linkage is against vc version!!
    1.77 +                        'lib/vc/librun.lib'
    1.78 +                    ).
    1.79 +        ].
    1.80 +        usedCompiler = 'lcc' ifTrue:[
    1.81 +            files := files , #( 
    1.82 +                        'librun/objvc/librun.dll'   "/ linkage is against vc version!!
    1.83 +                        'lib/vc/librun.lib'
    1.84                      ).
    1.85          ].
    1.86      ] ifFalse:[
    1.87 @@ -541,7 +554,7 @@
    1.88          ].
    1.89      ].
    1.90  
    1.91 -    "Modified: / 04-09-2012 / 11:59:53 / cg"
    1.92 +    "Modified (comment): / 05-09-2012 / 10:29:28 / cg"
    1.93  !
    1.94  
    1.95  createHeaderFileFor:aClass in:packageTargetDir