cmake updates for compiling with prebuilt py 3.1 on osx
authorMatt Ebb <matt@mke3.net>
Thu, 23 Jul 2009 14:20:08 +0000 (14:20 +0000)
committerMatt Ebb <matt@mke3.net>
Thu, 23 Jul 2009 14:20:08 +0000 (14:20 +0000)
CMakeLists.txt
source/creator/CMakeLists.txt

index b6b0ea2e5e945d8499b3990015f30dd9de3acb63..fc6a3d3ade8067a7ea2a3318ec750013ee64dc22 100644 (file)
@@ -350,7 +350,7 @@ IF(APPLE)
     SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "")
     SET(PYTHON_LIB python${PYTHON_VERSION})
     SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}" CACHE STRING "")
-    SET(PYTHON_LINKFLAGS "-u _PyMac_Error")
+    #    SET(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
   ELSE(PYTHON_VERSION MATCHES 3.1)
     # otherwise, use custom system framework
 
index 35cb3e92b217561b7086a4fda8d8e148ac23a352..adf0dca0d814ddc7dd381d2f4be657b6afa3421e 100644 (file)
@@ -128,8 +128,9 @@ IF(APPLE)
     COMMAND cp -R ${CMAKE_SOURCE_DIR}/bin/.blender/locale ${TARGETDIR}/blender.app/Contents/Resources/
     COMMAND cp -R ${CMAKE_SOURCE_DIR}/bin/.blender/locale ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
     COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages ${TARGETDIR}/blender.app/Contents/Resources/
-    COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/scripts ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
-    COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/ui ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
+    COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/scripts ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
+    COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/ui ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
+    COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/darwin/extra/python ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
     COMMAND find ${TARGETDIR}/blender.app -name CVS -prune -exec rm -rf {} "\;"
     COMMAND find ${TARGETDIR}/blender.app -name CVS.sandboxinfo -prune -exec rm -rf {} "\;"
     COMMAND find ${TARGETDIR}/blender.app -name .DS_Store -prune -exec rm -rf {} "\;"