Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merged changes in the trunk up to revision 52690.

Browse Source 
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenlib/intern/bpath.c
This commit is contained in:
Tamito Kajiyama
2012-12-01 02:47:59 +00:00
parent 129a29873e 75cce01a61
commit ed0e2fbd9f
259 changed files with 4507 additions and 2592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/creator/CMakeLists.txt
View File

@@ -472,14 +472,17 @@ elseif(WIN32)
if(WITH_PYTHON)
set_lib_path(PYLIB "python")
STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
install(
FILES ${PYLIB}/lib/python32.dll
FILES ${PYLIB}/lib/python${_PYTHON_VERSION_NO_DOTS}.dll
DESTINATION ${TARGETDIR}
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
)
install(
FILES ${PYLIB}/lib/python32_d.dll
FILES ${PYLIB}/lib/python${_PYTHON_VERSION_NO_DOTS}_d.dll
DESTINATION ${TARGETDIR}
CONFIGURATIONS Debug
)
@@ -503,10 +506,10 @@ elseif(WIN32)
"
if(\"\${CMAKE_INSTALL_CONFIG_NAME}\" STREQUAL \"Debug\")
execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\"
\"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32_d.tar.gz\")
\"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_d.tar.gz\")
else()
execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\"
\"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\")
\"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}.tar.gz\")
endif()
"
)
@@ -514,6 +517,8 @@ elseif(WIN32)
# doesnt work, todo
# install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
endif()
unset(_PYTHON_VERSION_NO_DOTS)
endif()
if(CMAKE_CL_64)