visual-c building
authorClaus Gittinger <cg@exept.de>
Mon, 20 Aug 2012 17:12:51 +0200
changeset 2905d02db91a0938
parent 2904 bd6cacbab203
child 2906 8057ed7bccd2
visual-c building
ProjectBuilder.st
     1.1 --- a/ProjectBuilder.st	Thu Aug 09 11:01:15 2012 +0200
     1.2 +++ b/ProjectBuilder.st	Mon Aug 20 17:12:51 2012 +0200
     1.3 @@ -275,7 +275,7 @@
     1.4  
     1.5      preRequisites do:[:eachPackageToFileout |
     1.6          |packageId packageDef packageModule packageDirectory packageTargetDir
     1.7 -         dllSource dllSourceDir libraryName dllRelativePath|
     1.8 +         dllSource dllSourceDir libraryName dllRelativePath objDir|
     1.9  
    1.10          packageId := eachPackageToFileout asPackageId.
    1.11          packageModule := packageId module.
    1.12 @@ -288,9 +288,10 @@
    1.13          "/ mhmh - take them from my tree or from the projects/smalltalk execution directory ??
    1.14          dllSourceDir := myTopDirectory / packageModule / packageDirectory.
    1.15          OperatingSystem isMSWINDOWSlike ifTrue:[
    1.16 -"/            dllRelativePath := 'objvc','/',(libraryName,'.dll').
    1.17 +            objDir := self objDirForUsedCompiler.
    1.18 +"/            dllRelativePath := objDir,'/',(libraryName,'.dll').
    1.19  "/            (dllSourceDir / dllRelativePath) exists 
    1.20 -            dllRelativePaths := Array with:('objbc\', libraryName, '.dll').
    1.21 +            dllRelativePaths := Array with:(objDir,'\', libraryName, '.dll').
    1.22          ] ifFalse:[
    1.23              dllRelativePaths := Array with:(libraryName,'.so').
    1.24              (packageModule = 'stx' and:[packageDirectory = 'libview']) ifTrue:[
    1.25 @@ -314,7 +315,7 @@
    1.26          ].
    1.27      ].
    1.28  
    1.29 -    "Modified: / 20-07-2012 / 18:30:06 / cg"
    1.30 +    "Modified: / 20-08-2012 / 17:00:33 / cg"
    1.31  !
    1.32  
    1.33  copyDirectory:relativepath
    1.34 @@ -418,18 +419,29 @@
    1.35  
    1.36      OperatingSystem isMSWINDOWSlike ifTrue:[
    1.37          files := #( 
    1.38 -                    'support/win32/borland/cs3245.dll' 
    1.39 -                    'support/win32/X11.dll'
    1.40 -                    'support/win32/Xext.dll'
    1.41 -                    'librun/objbc/librun.dll'
    1.42 -                    'libbc/librun.lib'
    1.43 -                    'libbc/cs32i.lib'
    1.44                      'librun/genDate.exe'
    1.45                      'librun/main.c'
    1.46                      'projects/smalltalk/stx_16x16.ico'
    1.47                      'projects/smalltalk/stx_32x32.ico'
    1.48                      'projects/smalltalk/stx_splash.bmp'
    1.49                   ).
    1.50 +
    1.51 +        usedCompiler = 'bcc' ifTrue:[
    1.52 +            files := files , #( 
    1.53 +                        'librun/objbc/librun.dll'
    1.54 +                        'support/win32/borland/cs3245.dll' 
    1.55 +                        'support/win32/X11.dll'
    1.56 +                        'support/win32/Xext.dll'
    1.57 +                        'libbc/librun.lib'
    1.58 +                        'libbc/cs32i.lib'
    1.59 +                    ).
    1.60 +        ].
    1.61 +        usedCompiler = 'vc' ifTrue:[
    1.62 +            files := files , #( 
    1.63 +                        'librun/objvc/librun.dll'
    1.64 +                        'libvc/librun.lib'
    1.65 +                    ).
    1.66 +        ].
    1.67      ] ifFalse:[
    1.68          files := #(
    1.69                      'librun/main.c'
    1.70 @@ -462,7 +474,7 @@
    1.71          ].
    1.72      ].
    1.73  
    1.74 -    "Modified: / 21-01-2012 / 13:40:56 / cg"
    1.75 +    "Modified: / 20-08-2012 / 17:10:37 / cg"
    1.76  !
    1.77  
    1.78  createHeaderFileFor:aClass in:packageTargetDir
    1.79 @@ -744,6 +756,15 @@
    1.80      "Modified: / 20-07-2012 / 12:13:29 / cg"
    1.81  !
    1.82  
    1.83 +objDirForUsedCompiler
    1.84 +    usedCompiler = 'bcc' ifTrue:[^ 'objbc'].
    1.85 +    usedCompiler = 'vc' ifTrue:[^ 'objvc'].
    1.86 +    self halt:'please fill in here'.
    1.87 +    ^ 'objbc'
    1.88 +
    1.89 +    "Created: / 20-08-2012 / 17:01:13 / cg"
    1.90 +!
    1.91 +
    1.92  recursiveCopyDirectoryForBuild:subdir
    1.93      |targetDir|
    1.94