# HG changeset patch # User Claus Gittinger # Date 1363029635 -3600 # Node ID e10937c3574892407dbab7ab30411d982dda051a # Parent 6d37e90dab0077f29eaf9f9770181a39fef02403 class: Tools::ProjectBuilder comment/format in: #copySupportFilesForLinkage diff -r 6d37e90dab00 -r e10937c35748 ProjectBuilder.st --- a/ProjectBuilder.st Mon Mar 11 20:07:35 2013 +0100 +++ b/ProjectBuilder.st Mon Mar 11 20:20:35 2013 +0100 @@ -634,7 +634,22 @@ (mySTXTopDirectory / relativePath) copyTo:(buildDirectory / 'stx' / relativePath). ] ] ifFalse:[ - self error:'Missing file: ',relativePath printString mayProceed:true. +"/ does not really help: objbc/librun.lib does not work with MSVC and vice versa... +"/ ((relativePath = 'librun/objvc/librun.dll') +"/ and:[ (mySTXTopDirectory / 'librun/objbc/librun.dll') exists ])ifTrue:[ +"/ stdErr nextPutLine:('Warning: using alternative librun from objbc (Borland version)...'). +"/ (buildDirectory / 'stx' / relativePath) directory recursiveMakeDirectory. +"/ (mySTXTopDirectory / 'librun/objbc/librun.dll') copyTo:(buildDirectory / 'stx' / relativePath). +"/ ] ifFalse:[ +"/ ((relativePath = 'librun/objbc/librun.dll') +"/ and:[ (mySTXTopDirectory / 'librun/objvc/librun.dll') exists ])ifTrue:[ +"/ stdErr nextPutLine:('Warning: using alternative librun from objvc (MSVC version)...'). +"/ (buildDirectory / 'stx' / relativePath) directory recursiveMakeDirectory. +"/ (mySTXTopDirectory / 'librun/objvc/librun.dll') copyTo:(buildDirectory / 'stx' / relativePath). +"/ ] ifFalse:[ + self error:'Missing file: ',relativePath printString mayProceed:true. +"/ ] +"/ ] ]. ].