libpng URL fixes and 32-bit build support for Mac

BUILD.md

@@ -15,6 +15,9 @@ When Polycode and its Dependencies are built, they will be available
 in the Release/YourArchitecture folder under the main source tree in 
 a structure that should mimic the main binary release.
 
+If you wish to build a 32-bit version on a 64-bit machine in OS X, pass
+-DCMAKE_OSX_ARCHITECTURES=i386 as an argument to cmake
+
 ## Building dependencies ##
 
 Polycode depends on a number of third party packages that are not

BUILD.txt

@@ -15,6 +15,9 @@ When Polycode and its Dependencies are built, they will be available
 in the Release/YourArchitecture folder under the main source tree in 
 a structure that should mimic the main binary release.
 
+If you wish to build a 32-bit version on a 64-bit machine in OS X, pass
+-DCMAKE_OSX_ARCHITECTURES=i386 as an argument to cmake
+
 ## Building dependencies ##
 
 Polycode depends on a number of third party packages that are not

CMake/ExternalAssimp.cmake

@@ -6,6 +6,7 @@ SET(assimp_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/assimp)
 SET(assimp_CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
     -DCMAKE_DEBUG_POSTFIX=d 
     -DENABLE_BOOST_WORKAROUND=ON 
     -DBUILD_ASSIMP_TOOLS=OFF 

CMake/ExternalBox2D.cmake

@@ -10,6 +10,7 @@ SET(box2d_PREFIX ${PROJECT_BINARY_DIR}/box2d)
 SET(box2d_CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
     -DCMAKE_DEBUG_POSTFIX=_d 
     -DBOX2D_INSTALL=ON 
     -DBOX2D_BUILD_EXAMPLES=OFF 

CMake/ExternalBullet.cmake

@@ -5,6 +5,7 @@ SET(bullet_PREFIX ${PROJECT_BINARY_DIR}/bullet)
 SET(bullet_CMAKE_ARGS 
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
     -DCMAKE_DEBUG_POSTFIX=_d
     -DINSTALL_LIBS=ON
     -DBUILD_DEMOS=OFF

CMake/ExternalFreetype.cmake

@@ -6,6 +6,7 @@ SET(freetype_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/freetype)
 SET(freetype_CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
 )
 
 EXTERNALPROJECT_ADD(freetype

CMake/ExternalLua51.cmake

@@ -6,6 +6,7 @@ SET(lua51_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/lua51)
 SET(lua51_CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
     -DCMAKE_DEBUG_POSTFIX=d
 )
 

CMake/ExternalOggVorbis.cmake

@@ -6,6 +6,7 @@ SET(oggvorbis_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/oggvorbis)
 SET(oggvorbis_CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
 )
 
 EXTERNALPROJECT_ADD(libogg

CMake/ExternalOpenAL.cmake

@@ -6,6 +6,7 @@ SET(openal_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/openal)
 SET(openal_CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
     -DCMAKE_DEBUG_POSTFIX=d
 )
 

CMake/ExternalPNG.cmake

@@ -6,6 +6,7 @@ SET(libpng_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libpng)
 SET(libpng_CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
     -DPNG_SHARED=OFF
     -DBUILD_SHARED_LIBS=FALSE
     -DSKIP_INSTALL_FILES=1
@@ -31,8 +32,8 @@ EXTERNALPROJECT_ADD(libpng
     PREFIX ${libpng_PREFIX}
 
     DOWNLOAD_DIR ${POLYCODE_DEPS_DOWNLOAD_DIR}
-    URL ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.9.tar.gz
-    URL_MD5 c740ba66cd7074ba2471b6a4ff48e1fb
+    URL ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.10.tar.gz
+    URL_MD5 9e5d864bce8f06751bbd99962ecf4aad
 
     INSTALL_DIR ${POLYCODE_DEPS_CORE_PREFIX}
     CMAKE_ARGS ${libpng_CMAKE_ARGS} -DCMAKE_PREFIX_PATH=${install_dir} # to find zlib

CMake/ExternalPhysFS.cmake

@@ -6,6 +6,7 @@ SET(physfs_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/physfs)
 SET(physfs_CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
     -DCMAKE_DEBUG_POSTFIX=d
     -DPHYSFS_BUILD_TEST=FALSE
     -DPHYSFS_BUILD_SHARED=FALSE