[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21819] branches/blender2.5/blender: cmake updates for compiling with prebuilt py 3.1 on osx

[Matt Ebb]

Revision: 21819
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21819
Author:   broken
Date:     2009-07-23 16:20:08 +0200 (Thu, 23 Jul 2009)

Log Message:
-----------
cmake updates for compiling with prebuilt py 3.1 on osx

Modified Paths:
--------------
    branches/blender2.5/blender/CMakeLists.txt
    branches/blender2.5/blender/source/creator/CMakeLists.txt

Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt	2009-07-23 14:18:51 UTC (rev 21818)
+++ branches/blender2.5/blender/CMakeLists.txt	2009-07-23 14:20:08 UTC (rev 21819)
@@ -350,7 +350,7 @@
     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
 

Modified: branches/blender2.5/blender/source/creator/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/creator/CMakeLists.txt	2009-07-23 14:18:51 UTC (rev 21818)
+++ branches/blender2.5/blender/source/creator/CMakeLists.txt	2009-07-23 14:20:08 UTC (rev 21819)
@@ -128,8 +128,9 @@
     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 {} "\;"