diff options
| author | Damien Plisson <damien.plisson@yahoo.fr> | 2009-10-19 18:38:19 +0400 |
|---|---|---|
| committer | Damien Plisson <damien.plisson@yahoo.fr> | 2009-10-19 18:38:19 +0400 |
| commit | 8d7c69ffa922d4d360b1eabe114e0f8e0e6a28e2 (patch) | |
| tree | d1a3515c450830e07a7420516a2a5f9265afb8d2 /source/creator | |
| parent | 54abd775d33ef35a217bb26413341c67fc638fed (diff) | |
CMake files update to allow use of MAC OSX 10.5 libs (and build 64bit blender on mac)
The WITH_LIBS10.5 option switches the use of the libs included in the darwin-9.x.universal folder
Use the CMAKE_OSX_ARCHITECTURES variable to set the architecture you want to build for (e.g. i386, x86_64). Only one at a time, this value is used to select the python_?.zip that is bundled with the app.
WITH_COCOA (build Cocoa ghost and not Carbon) is now on by default.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index bef41983bab..28985daf466 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -225,11 +225,16 @@ IF(WITH_INSTALL) ENDIF(WITH_INTERNATIONAL) IF(WITH_PYTHON) + IF(WITH_LIBS10.5) + SET(PYTHON_ZIP "python_${CMAKE_OSX_ARCHITECTURES}.zip") + ELSE(WITH_LIBS10.5) + SET(PYTHON_ZIP "python.zip") + ENDIF(WITH_LIBS10.5) ADD_CUSTOM_COMMAND( TARGET blender POST_BUILD MAIN_DEPENDENCY blender COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/scripts ${TARGETDIR}/blender.app/Contents/MacOS/.blender/ COMMAND mkdir ${TARGETDIR}/blender.app/Contents/MacOS/.blender/python/ - COMMAND unzip -q ${LIBDIR}/release/python.zip -d ${TARGETDIR}/blender.app/Contents/MacOS/.blender/python/ + COMMAND unzip -q ${LIBDIR}/release/${PYTHON_ZIP} -d ${TARGETDIR}/blender.app/Contents/MacOS/.blender/python/ COMMAND find ${TARGETDIR}/blender.app -name "*.py?" -prune -exec rm -rf {} "\;" ) ENDIF(WITH_PYTHON) |