Re-adding support for 'osx' and 'win' to avoid breaking changes

* Check for 'osx' and 'win' in the platforms list and replace them with 'osx32', 'osx64', and 'win32', 'win64' respectively.