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

fix path to release/python.zip for scons and cmake

Browse Source 
I hope this doesn't break anything
This commit is contained in:
Stefan Gartner
2010-08-04 11:07:14 +00:00
parent 247fbfaf03
commit 2f8f86e4f6
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build_files/scons/tools/Blender.py
View File

@@ -501,10 +501,7 @@ def AppIt(target=None, source=None, env=None):
installdir = env['BF_INSTALLDIR'] installdir = env['BF_INSTALLDIR']
print("compiled architecture: %s"%(osxarch)) print("compiled architecture: %s"%(osxarch))
print("Installing to %s"%(installdir)) print("Installing to %s"%(installdir))
if libdir == '../lib/darwin-9.x.universal': python_zip = 'python_' + osxarch + '.zip' # set specific python_arch.zip
python_zip = 'python_' + osxarch + '.zip' # set specific python_arch.zip
else:
python_zip = 'python.zip' # compatibility for darwin8 python.zip
print("unzipping to app-bundle: %s"%(python_zip)) print("unzipping to app-bundle: %s"%(python_zip))
bldroot = env.Dir('.').abspath bldroot = env.Dir('.').abspath
binary = env['BINARYKIND'] binary = env['BINARYKIND']

6
source/creator/CMakeLists.txt
View File

@@ -272,11 +272,7 @@ IF(WITH_INSTALL)
ENDIF(WITH_INTERNATIONAL) ENDIF(WITH_INTERNATIONAL)
IF(WITH_PYTHON) IF(WITH_PYTHON)
IF(WITH_LIBS10.5) SET(PYTHON_ZIP "python_${CMAKE_OSX_ARCHITECTURES}.zip")
SET(PYTHON_ZIP "python_${CMAKE_OSX_ARCHITECTURES}.zip")
ELSE(WITH_LIBS10.5)
SET(PYTHON_ZIP "python.zip")
ENDIF(WITH_LIBS10.5)
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
TARGET blender POST_BUILD MAIN_DEPENDENCY blender TARGET blender POST_BUILD MAIN_DEPENDENCY blender
COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/scripts ${TARGETDIR}/blender.app/Contents/MacOS/scripts/ COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/scripts ${TARGETDIR}/blender.app/Contents/MacOS/scripts/