[Bf-committers] diff patches of Os-X scons build

[Jean-Luc Peurière]

below is the cvs diff of the changes I made for building blender on  
10.3 with scons all bells and whistles enabled

$ cvs -q diff
Index: SConstruct
===================================================================
RCS file: /cvsroot/bf-blender/blender/SConstruct,v
retrieving revision 1.48
diff -r1.48 SConstruct
22c22
< version='2.32'
---
 > version='2.33'
108,110c108,110
<     use_international = 'false'
<     use_gameengine = 'false'
<     use_openal = 'false'
---
 >     use_international = 'true'
 >     use_gameengine = 'true'
 >     use_openal = 'true'
114c114
<     use_sumo = 'false'
---
 >     use_sumo = 'true'
121c121
<     # TODO: replace darwin-6.8-powerpc with the actual directiory on  
the
---
 >     # TODO: replace darwin-6.1-powerpc with the actual directiory on  
the
123,124c123,125
<     darwin_precomp = '#../lib/darwin-6.8-powerpc'
<     extra_flags = ['-pipe', '-fPIC', '-funsigned-char']
---
 >     darwin_precomp = '#../lib/darwin-6.1-powerpc'
 >     fink_path = '/sw/'
 >     extra_flags = ['-pipe', '-fPIC', '-funsigned-char', '-ffast-math']
130c131
<     release_flags = []
---
 >     release_flags = ['-O3']
139,140c140,141
<     png_libpath = []
<     png_include = []
---
 >     png_libpath = [fink_path + 'lib']
 >     png_include = [fink_path + 'include']
143,144c144,145
<     jpeg_libpath = []
<     jpeg_include = []
---
 >     jpeg_libpath = [fink_path + 'lib']
 >     jpeg_include = [fink_path + 'include']
164,169c165,170
<     solid_lib = []                                              # TODO
<     solid_libpath = []                                          # TODO
<     solid_include = ['#extern/solid']
<     qhull_lib = []                                              # TODO
<     qhull_libpath = []                                          # TODO
<     qhull_include = ['#extern/qhull/include']
---
 >     solid_lib = ['libsolid']
 >     solid_libpath = [darwin_precomp + '/solid/lib']
 >     solid_include = [darwin_precomp + '/solid/include']
 >     qhull_lib = ['libqhull']
 >     qhull_libpath = [darwin_precomp + '/qhull/lib']
 >     qhull_include = [darwin_precomp + '/qhull/include']
171,173c172,174
<     ode_lib = []                                                # TODO
<     ode_libpath = []                                            # TODO
<     ode_include = ['#extern/ode/dist/include/ode']
---
 >     ode_lib = ['libode']
 >     ode_libpath = [darwin_precomp + '/ode/lib']
 >     ode_include = [darwin_precomp + '/ode/include/ode']
175,178c176,184
<     python_lib = ['python%d.%d' % sys.version_info[0:2]]
<     python_libpath = [sysconfig.get_python_lib (0, 1) + '/config']
<     python_include = [sysconfig.get_python_inc ()]
<     python_linkflags = Split  
(sysconfig.get_config_var('LINKFORSHARED'))
---
 > #    python_lib = ['python%d.%d' % sys.version_info[0:2]]
 > #    python_libpath = [sysconfig.get_python_lib (0, 1) + '/config']
 > #    python_include = [sysconfig.get_python_inc ()]
 > #    python_linkflags = Split  
(sysconfig.get_config_var('LINKFORSHARED'))
 >     python_lib = ['python2.3']
 >     python_libpath =  
['/System/Library/Frameworks/Python.framework/Versions/2.3/lib/ 
python2.3/config']
 >     python_include =  
['/System/Library/Frameworks/Python.framework/Versions/2.3/include/ 
python2.3']
 >     python_linkflags = ['-u', '__dummy', '-u', '_PyMac_Error',  
'-framework', 'System', '-framework',
 > 'Python', '-framework', 'CoreServices', '-framework', 'Foundation']
183,188c189,194
<     freetype_lib = ['freetype']
<     freetype_libpath = [darwin_precomp + '/freetype/lib']
<     freetype_include = [darwin_precomp + '/freetype/include']
<     gettext_lib = []
<     gettext_libpath = []
<     gettext_include = []
---
 >     freetype_lib = ['libfreetype']
 >     freetype_libpath = ['/usr/X11R6/lib']
 >     freetype_include = ['/usr/X11R6/include/freetype2']
 >     gettext_lib = ['libintl']
 >     gettext_libpath = [darwin_precomp + '/gettex/lib']
 >     gettext_include = [darwin_precomp + '/gettex/include']
190,192c196,198
<     openal_lib = []
<     openal_libpath = []
<     openal_include = []
---
 >     openal_lib = ['libopenal']
 >     openal_libpath = [darwin_precomp + '/openal/lib']
 >     openal_include = [darwin_precomp + '/openal/include/AL']
961a968,973
 >     link_env.Append (LINKFLAGS='-framework')
 >     link_env.Append (LINKFLAGS='AudioUnit')
 >     link_env.Append (LINKFLAGS='-framework')
 >     link_env.Append (LINKFLAGS='AudioToolbox')
 >     link_env.Append (LINKFLAGS='-framework')
 >     link_env.Append (LINKFLAGS='CoreAudio')
Index: extern/qhull/SConscript
===================================================================
RCS file: /cvsroot/bf-blender/blender/extern/qhull/SConscript,v
retrieving revision 1.3
diff -r1.3 SConscript
14a15,16
 > elif sys.platform=='darwin':
 >       qhull_env.Append (CCFLAGS = ['-O2', '-pipe', '-fPIC',  
'-funsigned-char', '-ffast-math'])
Index: extern/solid/SConscript
===================================================================
RCS file: /cvsroot/bf-blender/blender/extern/solid/SConscript,v
retrieving revision 1.3
diff -r1.3 SConscript
19a20,22
 > elif sys.platform=='darwin' :
 >     defines += ['NDEBUG']
 >     cflags += ['-O2',  '-pipe', '-fPIC', '-funsigned-char',  
'-ffast-math']
Index: source/blender/ftfont/SConscript
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/ftfont/SConscript,v
retrieving revision 1.7
diff -r1.7 SConscript
12c12,13
<                  '../blenlib',
---
 >                  '../blenkernel',
 >                '../blenlib',
-- 
Jean-luc