[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10735] trunk/blender: post release update of the scons build system for os x powerpc
JLuc Peuriere
jlp at nerim.net
Sun May 20 00:57:29 CEST 2007
Revision: 10735
https://svn.blender.org//revision/?rev=10735&view=rev
Author: lukep
Date: 2007-05-20 00:57:28 +0200 (Sun, 20 May 2007)
Log Message:
-----------
post release update of the scons build system for os x powerpc
assume os x 10.4 as defaut
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/config/darwin-config.py
trunk/blender/source/gameengine/Rasterizer/SConscript
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2007-05-19 16:13:20 UTC (rev 10734)
+++ trunk/blender/SConstruct 2007-05-19 22:57:28 UTC (rev 10735)
@@ -71,6 +71,11 @@
if not use_color=='1':
B.bc.disable()
+
+ #on defaut white Os X terminal, some colors are totally unlegible
+if platform=='darwin':
+ B.bc.OKGREEN = '\033[34m'
+ B.bc.WARNING = '\033[36m'
# arguments
print B.bc.HEADER+'Command-line arguments'+B.bc.ENDC
Modified: trunk/blender/config/darwin-config.py
===================================================================
--- trunk/blender/config/darwin-config.py 2007-05-19 16:13:20 UTC (rev 10734)
+++ trunk/blender/config/darwin-config.py 2007-05-19 22:57:28 UTC (rev 10735)
@@ -1,11 +1,26 @@
LCGDIR = '#../lib/darwin-6.1-powerpc'
LIBDIR = '${LCGDIR}'
+# enable ffmpeg support
+WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG
+BF_FFMPEG = LIBDIR +'/ffmpeg'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include'
+BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a'
+
WITH_BF_VERSE = 'false'
-BF_VERSE_INCLUDE = "#extern/verse/dist"
+BF_VERSE = "#extern/verse/dist"
+BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist"
+BF_VERSE_INCLUDE = BF_VERSE
+BF_VERSE_LIBS = "libverse"
-BF_PYTHON = '/System/Library/Frameworks/Python.framework/Versions/'
-BF_PYTHON_VERSION = '2.5'
+# python.org libs install in /library
+BF_PYTHON_VERSION = '2.3'
+if BF_PYTHON_VERSION=='2.3':
+ BF_PYTHON = '/System/Library/Frameworks/Python.framework/Versions/'
+else:
+ BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
+
BF_PYTHON_INC = '${BF_PYTHON}${BF_PYTHON_VERSION}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = '${BF_PYTHON}${BF_PYTHON_VERSION}/bin/python${BF_PYTHON_VERSION}'
BF_PYTHON_LIB = ''
@@ -13,7 +28,12 @@
BF_PYTHON_LINKFLAGS = '-u __dummy -u _PyMac_Error -framework System -framework Python'
WITH_BF_OPENAL = 'true'
-BF_OPENAL = LIBDIR + '/openal'
+#different lib must be used following version of gcc
+# for gcc 3.3
+#BF_OPENAL = LIBDIR + '/openal'
+# for gcc 3.4
+BF_OPENAL = '#../lib/darwin-8.0.0-powerpc/openal'
+
BF_OPENAL_INC = '${BF_OPENAL}/include'
BF_OPENAL_LIB = 'openal'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
@@ -30,7 +50,7 @@
WITH_BF_OPENEXR = 'true'
BF_OPENEXR = '/usr/local'
BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
-BF_OPENEXR_LIB = ' Iex Half IlmImf Imath '
+BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread'
WITH_BF_JPEG = 'true'
@@ -65,8 +85,8 @@
BF_FTGL_INC = '${BF_FTGL}/include'
BF_FTGL_LIB = 'extern_ftgl'
-WITH_BF_GAMEENGINE='false'
-WITH_BF_PLAYER='false'
+WITH_BF_GAMEENGINE='true'
+WITH_BF_PLAYER='true'
WITH_BF_ODE = 'false'
BF_ODE = LIBDIR + '/ode'
@@ -129,9 +149,9 @@
CFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
-CPPFLAGS = []
-CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
-CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
+CPPFLAGS = ['-fpascal-strings']
+CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing', '-fpascal-strings']
+CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing', '-fpascal-strings']
PLATFORM_LINKFLAGS = '-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime'
REL_CFLAGS = ['-O2']
REL_CCFLAGS = ['-O2']
Modified: trunk/blender/source/gameengine/Rasterizer/SConscript
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/SConscript 2007-05-19 16:13:20 UTC (rev 10734)
+++ trunk/blender/source/gameengine/Rasterizer/SConscript 2007-05-19 22:57:28 UTC (rev 10735)
@@ -5,8 +5,9 @@
incs = '. #source/kernel/gen_system #intern/string #intern/moto/include'
-cflags = []
if env['OURPLATFORM']=='win32-vc':
- cflags.append('/Ox')
-
-env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['game','player'], priority=[35,115], compileflags = cflags )
+ cflags = []
+ cflags.append('/Ox')
+ env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['game','player'], priority=[35,115], compileflags = cflags )
+else:
+ env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['game','player'], priority=[35,115] )
More information about the Bf-blender-cvs
mailing list