diff --git a/blender-2.44-scons.patch b/blender-2.44-scons.patch index 5afb80f..87183ce 100644 --- a/blender-2.44-scons.patch +++ b/blender-2.44-scons.patch @@ -1,11 +1,27 @@ ---- blender-2.44/SConstruct.orig 2007-05-07 18:09:40.000000000 +0200 -+++ blender-2.44/SConstruct 2007-05-20 22:52:13.000000000 +0200 -@@ -237,7 +242,7 @@ +diff -up blender-2.45/SConstruct.scons blender-2.45/SConstruct +--- blender-2.45/SConstruct.scons 2008-12-27 10:09:33.000000000 +0100 ++++ blender-2.45/SConstruct 2008-12-27 10:09:15.000000000 +0100 +@@ -170,6 +170,8 @@ else: + opts = btools.read_opts(optfiles, B.arguments) + opts.Update(env) - def CheckFreeAlut(context,env): - context.Message( B.bc.OKGREEN + "Linux platform detected:\n checking for FreeAlut... " + B.bc.ENDC ) -- env['LIBS'] = 'alut' -+ env['LIBS'] = ['alut', 'openal'] - result = context.TryLink(mylib_test_source_file, '.c') - context.Result(result) - return result ++env['CCFLAGS'] = env['CCFLAGS'].split() ++ + # disable elbeem (fluidsim) compilation? + if env['BF_NO_ELBEEM'] == 1: + env['CPPFLAGS'].append('-DDISABLE_ELBEEM') +diff -up blender-2.45/tools/btools.py.scons blender-2.45/tools/btools.py +--- blender-2.45/tools/btools.py.scons 2007-09-18 07:00:48.000000000 +0200 ++++ blender-2.45/tools/btools.py 2008-12-27 10:08:37.000000000 +0100 +@@ -1,7 +1,10 @@ + import os + import os.path + import SCons.Options +-import SCons.Options.BoolOption ++try: ++ import SCons.Options.BoolOption ++except ImportError: ++ pass + try: + import subprocess + except ImportError: diff --git a/blender.spec b/blender.spec index d7df5d6..060c6ed 100644 --- a/blender.spec +++ b/blender.spec @@ -94,7 +94,7 @@ sed -e 's|@LIB@|%{_libdir}|g' -e "s/@PYVER@/$PYVER/g" \ <%{SOURCE7} >user-config.py %build -scons %{?_smp_mflags} blenderplayer BF_QUIET=0 {CFLAGS,CXXFLAGS}='%{optflags}' +scons %{?_smp_mflags} blenderplayer BF_QUIET=0 CCFLAGS='%{optflags}' install -d release/plugins/include install -m 644 source/blender/blenpluginapi/*.h release/plugins/include