diff -r f9ec2e76c54c -r c62417f88241 ProjectBuilder.st --- a/ProjectBuilder.st Sat Oct 08 23:14:46 2016 +0200 +++ b/ProjectBuilder.st Sun Oct 09 11:29:12 2016 +0200 @@ -424,7 +424,7 @@ dest := packageTargetDir / dllRelativeDestPath. (dest exists not or:[source fileSize ~= dest fileSize - or:[source modificationTime >= dest modificationTime + or:[source modificationTime > dest modificationTime "/ or:[ ((dllSourceDir / dllRelativePath) sameContentsAs:(packageTargetDir / dllRelativePath)) not ] ]]) ifTrue:[ Transcript showCR:'updating ',dllRelativeDestPath. @@ -598,7 +598,7 @@ copySupportFilesForLinkage "copy additional files which are req'd for linkage to the build directory" - |files| + |files fn| OperatingSystem isMSWINDOWSlike ifTrue:[ files := #( @@ -652,11 +652,22 @@ files := files asOrderedCollection. OperatingSystem isMSWINDOWSlike ifTrue:[ - projectDefinitionClass applicationIconFileName notNil ifTrue:[ - files add:('projects/smalltalk/',projectDefinitionClass applicationIconFileName,'.ico') + (fn := projectDefinitionClass applicationIconFileNameWindows) notNil ifTrue:[ + fn asFilename suffix isEmptyOrNil ifTrue:[ + fn := fn,'.ico' + ]. + files add:('projects/smalltalk/',fn) ]. - projectDefinitionClass splashFileName notNil ifTrue:[ - files add:('projects/smalltalk/',projectDefinitionClass splashFileName,'.bmp') + (fn := projectDefinitionClass splashFileName) notNil ifTrue:[ + files add:('projects/smalltalk/',fn,'.bmp') + ]. + ]. + OperatingSystem isOSXlike ifTrue:[ + (fn := projectDefinitionClass applicationIconFileNameOSX) notNil ifTrue:[ + fn asFilename suffix isEmptyOrNil ifTrue:[ + fn := fn,'.icns' + ]. + files add:('projects/smalltalk/',fn) ]. ].