I meant, "should now work" :)
On Wed, Nov 9, 2011 at 12:49 PM, Brecht Van Lommel <[email protected]> wrote: > Revision: 41696 > > http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41696 > Author: blendix > Date: 2011-11-09 11:49:39 +0000 (Wed, 09 Nov 2011) > Log Message: > ----------- > Cycles: mac + scons build should not work. > > Modified Paths: > -------------- > trunk/blender/build_files/scons/config/darwin-config.py > trunk/blender/build_files/scons/tools/Blender.py > > Modified: trunk/blender/build_files/scons/config/darwin-config.py > =================================================================== > --- trunk/blender/build_files/scons/config/darwin-config.py 2011-11-09 > 11:38:04 UTC (rev 41695) > +++ trunk/blender/build_files/scons/config/darwin-config.py 2011-11-09 > 11:49:39 UTC (rev 41696) > @@ -254,8 +254,6 @@ > > 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_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 > > Modified: trunk/blender/build_files/scons/tools/Blender.py > =================================================================== > --- trunk/blender/build_files/scons/tools/Blender.py 2011-11-09 11:38:04 > UTC (rev 41695) > +++ trunk/blender/build_files/scons/tools/Blender.py 2011-11-09 11:49:39 > UTC (rev 41696) > @@ -550,10 +550,6 @@ > 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 @@ > 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) > > _______________________________________________ > Bf-blender-cvs mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-blender-cvs > _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
