diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-09 15:49:39 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-09 15:49:39 +0400 |
commit | adf17b48d8b179aa02bee86f0b3dae771449d8c1 (patch) | |
tree | 0355ab4106de87bee7482886d497b2ddce3feab9 | |
parent | 2f1e51ac99e77c88e6568a7182d06f1ef3597f94 (diff) |
Cycles: mac + scons build should not work.
-rw-r--r-- | build_files/scons/config/darwin-config.py | 17 | ||||
-rw-r--r-- | build_files/scons/tools/Blender.py | 21 |
2 files changed, 32 insertions, 6 deletions
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 69cf54dc740..02beb80b5b1 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -254,8 +254,6 @@ BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib' WITH_BF_QUICKTIME = True -WITH_BF_CYCLES = False - WITH_BF_ICONV = True BF_ICONV = '/usr' BF_ICONV_INC = '${BF_ICONV}/include' @@ -284,6 +282,21 @@ BF_PCRE_LIBPATH = '${BF_PCRE}/lib' #BF_EXPAT_LIB = 'expat' #BF_EXPAT_LIBPATH = '/usr/lib' +#Cycles +WITH_BF_CYCLES = True + +WITH_BF_OIIO = True +BF_OIIO = LIBDIR + '/openimageio' +BF_OIIO_INC = BF_OIIO + '/include' +BF_OIIO_LIB = 'OpenImageIO' +BF_OIIO_LIBPATH = BF_OIIO + '/lib' + +WITH_BF_BOOST = True +BF_BOOST = LIBDIR + '/boost' +BF_BOOST_INC = BF_BOOST + '/include' +BF_BOOST_LIB = 'boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt' +BF_BOOST_LIBPATH = BF_BOOST + '/lib' + #Ray trace optimization if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386': WITH_BF_RAYOPTIMIZATION = True diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index c97e6211757..76fa8ee7489 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -550,10 +550,6 @@ def AppIt(target=None, source=None, env=None): bldroot = env.Dir('.').abspath binary = env['BINARYKIND'] - if b=='verse': - print bc.OKBLUE+"no bundle for verse"+bc.ENDC - return 0 - sourcedir = bldroot + '/source/darwin/%s.app'%binary sourceinfo = bldroot + "/source/darwin/%s.app/Contents/Info.plist"%binary targetinfo = installdir +'/' + "%s.app/Contents/Info.plist"%binary @@ -582,6 +578,23 @@ def AppIt(target=None, source=None, env=None): cmd = 'cp -R %s/release/scripts %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION) commands.getoutput(cmd) + if env['WITH_BF_CYCLES']: + croot = '%s/intern/cycles' % (bldroot) + cinstalldir = '%s/%s.app/Contents/MacOS/%s/scripts/addons/cycles' % (installdir,binary,VERSION) + + cmd = 'mkdir %s' % (cinstalldir) + commands.getoutput(cmd) + cmd = 'mkdir %s/kernel' % (cinstalldir) + commands.getoutput(cmd) + cmd = 'cp -R %s/blender/addon/*.py %s/' % (croot, cinstalldir) + commands.getoutput(cmd) + cmd = 'cp -R %s/doc/license %s/license' % (croot, cinstalldir) + commands.getoutput(cmd) + cmd = 'cp -R %s/kernel/*.h %s/kernel/*.cl %s/kernel/*.cu %s/kernel/' % (croot, croot, croot, cinstalldir) + commands.getoutput(cmd) + cmd = 'cp -R %s/kernel/svm %s/util/util_color.h %s/util/util_math.h %s/util/util_transform.h %s/util/util_types.h %s/kernel/' % (croot, croot, croot, croot, croot, cinstalldir) + commands.getoutput(cmd) + if env['WITH_OSX_STATICPYTHON']: cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary, VERSION) commands.getoutput(cmd) |