Seems a bit odd to add a new option for this, couldn't OSX reuse WITH_BF_STATICPYTHON ?
On Thu, Sep 1, 2011 at 12:15 AM, jens verwiebe <[email protected]> wrote: > Revision: 39823 > > http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39823 > Author: jensverwiebe > Date: 2011-08-31 14:15:14 +0000 (Wed, 31 Aug 2011) > Log Message: > ----------- > OSX/scons: fix compile with static python, my patch was a bit outdates, sorry > > Modified Paths: > -------------- > trunk/blender/build_files/scons/config/darwin-config.py > trunk/blender/build_files/scons/tools/Blender.py > trunk/blender/build_files/scons/tools/btools.py > > Modified: trunk/blender/build_files/scons/config/darwin-config.py > =================================================================== > --- trunk/blender/build_files/scons/config/darwin-config.py 2011-08-31 > 11:21:54 UTC (rev 39822) > +++ trunk/blender/build_files/scons/config/darwin-config.py 2011-08-31 > 14:15:14 UTC (rev 39823) > @@ -14,7 +14,7 @@ > ################### Cocoa & architecture settings ################## > ############################################################################# > WITH_GHOST_COCOA=True > -MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64 > +MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64 > > > cmd = 'uname -p' > @@ -105,9 +105,9 @@ > #bz2 is a standard osx dynlib > > BF_PYTHON_VERSION = '3.2' > -WITH_BF_STATICPYTHON ='True' > +WITH_OSX_STATICPYTHON = True > > -if BF_PYTHON_VERSION=='3.2' and WITH_BF_STATICPYTHON =='True': > +if WITH_OSX_STATICPYTHON: > # python 3.2 uses precompiled libraries in bf svn /lib by default > > BF_PYTHON = LIBDIR + '/python' > @@ -327,7 +327,7 @@ > else: > PLATFORM_LINKFLAGS = > PLATFORM_LINKFLAGS+['-framework','QuickTime'] > > -if WITH_BF_STATICPYTHON == 'False': > +if not WITH_OSX_STATICPYTHON: > PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','Python'] > > > > Modified: trunk/blender/build_files/scons/tools/Blender.py > =================================================================== > --- trunk/blender/build_files/scons/tools/Blender.py 2011-08-31 11:21:54 > UTC (rev 39822) > +++ trunk/blender/build_files/scons/tools/Blender.py 2011-08-31 14:15:14 > UTC (rev 39823) > @@ -536,7 +536,7 @@ > print("Installing to %s"%(installdir)) > # TODO, use tar. > python_zip = 'python_' + osxarch + '.zip' # set specific python_arch.zip > - if env['WITH_BF_STATICPYTHON'] == 'True': > + if env['WITH_OSX_STATICPYTHON']: > print("unzipping to app-bundle: %s"%(python_zip)) > else: > print("dynamic build - make sure to have python3.x-framework > installed") > @@ -572,15 +572,12 @@ > commands.getoutput(cmd) > cmd = 'cp %s/release/bin/%s/.Blanguages > %s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary) > commands.getoutput(cmd) > - if env['WITH_BF_STATICPYTHON'] == 'True': > - cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(builddir,binary, > VERSION) > + if env['WITH_OSX_STATICPYTHON']: > + cmd = 'mkdir > %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary, VERSION) > commands.getoutput(cmd) > - cmd = 'unzip -q %s/release/%s -d > %s/%s.app/Contents/MacOS/%s/python/'%(libdir,python_zip,builddir,binary,VERSION) > + cmd = 'unzip -q %s/release/%s -d > %s/%s.app/Contents/MacOS/%s/python/'%(libdir,python_zip,installdir,binary,VERSION) > commands.getoutput(cmd) > > - cmd = 'cp -R -L %s/release/scripts > %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION) > - commands.getoutput(cmd) > - > if binary == 'blender':#not copy everything for blenderplayer > cmd = 'cp -R %s/release/scripts > %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION) > commands.getoutput(cmd) > > Modified: trunk/blender/build_files/scons/tools/btools.py > =================================================================== > --- trunk/blender/build_files/scons/tools/btools.py 2011-08-31 11:21:54 > UTC (rev 39822) > +++ trunk/blender/build_files/scons/tools/btools.py 2011-08-31 14:15:14 > UTC (rev 39823) > @@ -78,7 +78,7 @@ > > def validate_arguments(args, bc): > opts_list = [ > - 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', > 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', > 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', > 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', > + 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', > 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', > 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', > 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', > 'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', > 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC', > 'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', > 'BF_SDL_LIBPATH', > 'BF_LIBSAMPLERATE', 'BF_LIBSAMPLERATE_INC', > 'BF_LIBSAMPLERATE_LIB', 'BF_LIBSAMPLERATE_LIBPATH', > 'WITH_BF_STATICLIBSAMPLERATE', 'BF_LIBSAMPLERATE_LIB_STATIC', > @@ -230,6 +230,7 @@ > ('BF_PYTHON_LIBPATH', 'Library path', ''), > ('BF_PYTHON_LINKFLAGS', 'Python link flags', ''), > (BoolVariable('WITH_BF_STATICPYTHON', 'Staticly link to python', > False)), > + (BoolVariable('WITH_OSX_STATICPYTHON', 'Staticly link to python', > False)), > ('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: > m, mu, etc)', ''), > > (BoolVariable('BF_NO_ELBEEM', 'Disable Fluid Sim', False)), > > _______________________________________________ > Bf-blender-cvs mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-blender-cvs > -- - Campbell _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
