--- a/ProjectBuilder.st Thu Aug 09 11:01:15 2012 +0200
+++ b/ProjectBuilder.st Mon Aug 20 17:12:51 2012 +0200
@@ -275,7 +275,7 @@
preRequisites do:[:eachPackageToFileout |
|packageId packageDef packageModule packageDirectory packageTargetDir
- dllSource dllSourceDir libraryName dllRelativePath|
+ dllSource dllSourceDir libraryName dllRelativePath objDir|
packageId := eachPackageToFileout asPackageId.
packageModule := packageId module.
@@ -288,9 +288,10 @@
"/ mhmh - take them from my tree or from the projects/smalltalk execution directory ??
dllSourceDir := myTopDirectory / packageModule / packageDirectory.
OperatingSystem isMSWINDOWSlike ifTrue:[
-"/ dllRelativePath := 'objvc','/',(libraryName,'.dll').
+ objDir := self objDirForUsedCompiler.
+"/ dllRelativePath := objDir,'/',(libraryName,'.dll').
"/ (dllSourceDir / dllRelativePath) exists
- dllRelativePaths := Array with:('objbc\', libraryName, '.dll').
+ dllRelativePaths := Array with:(objDir,'\', libraryName, '.dll').
] ifFalse:[
dllRelativePaths := Array with:(libraryName,'.so').
(packageModule = 'stx' and:[packageDirectory = 'libview']) ifTrue:[
@@ -314,7 +315,7 @@
].
].
- "Modified: / 20-07-2012 / 18:30:06 / cg"
+ "Modified: / 20-08-2012 / 17:00:33 / cg"
!
copyDirectory:relativepath
@@ -418,18 +419,29 @@
OperatingSystem isMSWINDOWSlike ifTrue:[
files := #(
- 'support/win32/borland/cs3245.dll'
- 'support/win32/X11.dll'
- 'support/win32/Xext.dll'
- 'librun/objbc/librun.dll'
- 'libbc/librun.lib'
- 'libbc/cs32i.lib'
'librun/genDate.exe'
'librun/main.c'
'projects/smalltalk/stx_16x16.ico'
'projects/smalltalk/stx_32x32.ico'
'projects/smalltalk/stx_splash.bmp'
).
+
+ usedCompiler = 'bcc' ifTrue:[
+ files := files , #(
+ 'librun/objbc/librun.dll'
+ 'support/win32/borland/cs3245.dll'
+ 'support/win32/X11.dll'
+ 'support/win32/Xext.dll'
+ 'libbc/librun.lib'
+ 'libbc/cs32i.lib'
+ ).
+ ].
+ usedCompiler = 'vc' ifTrue:[
+ files := files , #(
+ 'librun/objvc/librun.dll'
+ 'libvc/librun.lib'
+ ).
+ ].
] ifFalse:[
files := #(
'librun/main.c'
@@ -462,7 +474,7 @@
].
].
- "Modified: / 21-01-2012 / 13:40:56 / cg"
+ "Modified: / 20-08-2012 / 17:10:37 / cg"
!
createHeaderFileFor:aClass in:packageTargetDir
@@ -744,6 +756,15 @@
"Modified: / 20-07-2012 / 12:13:29 / cg"
!
+objDirForUsedCompiler
+ usedCompiler = 'bcc' ifTrue:[^ 'objbc'].
+ usedCompiler = 'vc' ifTrue:[^ 'objvc'].
+ self halt:'please fill in here'.
+ ^ 'objbc'
+
+ "Created: / 20-08-2012 / 17:01:13 / cg"
+!
+
recursiveCopyDirectoryForBuild:subdir
|targetDir|