[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17187] branches/soc-2008-unclezeiv: svn merge -r 17157:17186 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Davide Vercelli
davide.vercelli at gmail.com
Thu Oct 23 00:29:25 CEST 2008
Revision: 17187
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17187
Author: unclezeiv
Date: 2008-10-23 00:29:24 +0200 (Thu, 23 Oct 2008)
Log Message:
-----------
svn merge -r 17157:17186 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2008-unclezeiv/config/darwin-config.py
branches/soc-2008-unclezeiv/config/linux2-config.py
branches/soc-2008-unclezeiv/config/linuxcross-config.py
branches/soc-2008-unclezeiv/config/openbsd3-config.py
branches/soc-2008-unclezeiv/config/sunos5-config.py
branches/soc-2008-unclezeiv/config/win32-mingw-config.py
branches/soc-2008-unclezeiv/config/win32-vc-config.py
branches/soc-2008-unclezeiv/extern/bFTGL/SConscript
branches/soc-2008-unclezeiv/intern/SConscript
branches/soc-2008-unclezeiv/intern/elbeem/SConscript
branches/soc-2008-unclezeiv/release/datafiles/splash.jpg
branches/soc-2008-unclezeiv/release/scripts/export_fbx.py
branches/soc-2008-unclezeiv/release/scripts/export_obj.py
branches/soc-2008-unclezeiv/release/scripts/import_obj.py
branches/soc-2008-unclezeiv/release/scripts/object_drop.py
branches/soc-2008-unclezeiv/release/text/release_248.txt
branches/soc-2008-unclezeiv/source/SConscript
branches/soc-2008-unclezeiv/source/blender/SConscript
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/SConscript
branches/soc-2008-unclezeiv/source/blender/blenlib/SConscript
branches/soc-2008-unclezeiv/source/blender/blenpluginapi/SConscript
branches/soc-2008-unclezeiv/source/blender/imbuf/SConscript
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2008-unclezeiv/source/blender/nodes/SConscript
branches/soc-2008-unclezeiv/source/blender/python/BPY_interface.c
branches/soc-2008-unclezeiv/source/blender/python/SConscript
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Draw.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Draw.py
branches/soc-2008-unclezeiv/source/blender/render/SConscript
branches/soc-2008-unclezeiv/source/blender/src/SConscript
branches/soc-2008-unclezeiv/source/blender/src/buttons_editing.c
branches/soc-2008-unclezeiv/source/blender/src/header_info.c
branches/soc-2008-unclezeiv/source/blender/src/header_view3d.c
branches/soc-2008-unclezeiv/source/blender/src/keyframing.c
branches/soc-2008-unclezeiv/source/blender/src/splash.jpg.c
branches/soc-2008-unclezeiv/source/blender/src/toets.c
branches/soc-2008-unclezeiv/source/blender/src/view.c
branches/soc-2008-unclezeiv/source/creator/SConscript
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2008-unclezeiv/tools/Blender.py
branches/soc-2008-unclezeiv/tools/btools.py
Modified: branches/soc-2008-unclezeiv/config/darwin-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/darwin-config.py 2008-10-22 22:06:03 UTC (rev 17186)
+++ branches/soc-2008-unclezeiv/config/darwin-config.py 2008-10-22 22:29:24 UTC (rev 17187)
@@ -8,7 +8,7 @@
import commands
# IMPORTANT NOTE : OFFICIAL BUILDS SHOULD BE DONE WITH SDKs
-USE_SDK='true'
+USE_SDK=True
BF_PYTHON_VERSION = '2.3'
@@ -38,15 +38,15 @@
# enable ffmpeg support
-WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True # -DWITH_FFMPEG
BF_FFMPEG = "#extern/ffmpeg"
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
-if USE_SDK=='true':
+if USE_SDK==True:
BF_FFMPEG_EXTRA = '-isysroot '+MACOSX_SDK+' -mmacosx-version-min='+MAC_MIN_VERS
#BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
#BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a'
-WITH_BF_VERSE = 'false'
+WITH_BF_VERSE = False
BF_VERSE = "#extern/verse/dist"
BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist"
BF_VERSE_INCLUDE = BF_VERSE
@@ -76,9 +76,9 @@
# Note : should be true, but openal simply dont work on intel
if MAC_PROC == 'i386':
- WITH_BF_OPENAL = 'false'
+ WITH_BF_OPENAL = False
else:
- WITH_BF_OPENAL = 'true'
+ WITH_BF_OPENAL = True
#different lib must be used following version of gcc
# for gcc 3.3
#BF_OPENAL = LIBDIR + '/openal'
@@ -88,7 +88,7 @@
else :
BF_OPENAL = LIBDIR + '/openal'
-WITH_BF_STATICOPENAL = 'false'
+WITH_BF_STATICOPENAL = False
BF_OPENAL_INC = '${BF_OPENAL}/include'
BF_OPENAL_LIB = 'openal'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
@@ -97,20 +97,20 @@
# Warning, this static lib configuration is untested! users of this OS please confirm.
BF_CXX = '/usr'
-WITH_BF_STATICCXX = 'false'
+WITH_BF_STATICCXX = False
BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-WITH_BF_SDL = 'true'
+WITH_BF_SDL = True
BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
BF_SDL_LIBPATH = '${BF_SDL}/lib'
-WITH_BF_FMOD = 'false'
+WITH_BF_FMOD = False
BF_FMOD = LIBDIR + '/fmod'
-WITH_BF_OPENEXR = 'true'
-WITH_BF_STATICOPENEXR = 'false'
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
BF_OPENEXR = '${LCGDIR}/openexr'
BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread'
@@ -118,15 +118,15 @@
# Warning, this static lib configuration is untested! users of this OS please confirm.
BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
-WITH_BF_DDS = 'true'
+WITH_BF_DDS = True
-WITH_BF_JPEG = 'true'
+WITH_BF_JPEG = True
BF_JPEG = LIBDIR + '/jpeg'
BF_JPEG_INC = '${BF_JPEG}/include'
BF_JPEG_LIB = 'jpeg'
BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
-WITH_BF_PNG = 'true'
+WITH_BF_PNG = True
BF_PNG = LIBDIR + '/png'
BF_PNG_INC = '${BF_PNG}/include'
BF_PNG_LIB = 'png'
@@ -135,32 +135,32 @@
BF_TIFF = LIBDIR + '/tiff'
BF_TIFF_INC = '${BF_TIFF}/include'
-WITH_BF_ZLIB = 'true'
+WITH_BF_ZLIB = True
BF_ZLIB = '/usr'
BF_ZLIB_INC = '${BF_ZLIB}/include'
BF_ZLIB_LIB = 'z'
-WITH_BF_INTERNATIONAL = 'true'
+WITH_BF_INTERNATIONAL = True
BF_GETTEXT = LIBDIR + '/gettext'
BF_GETTEXT_INC = '${BF_GETTEXT}/include'
BF_GETTEXT_LIB = 'intl'
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-WITH_BF_FTGL = 'true'
+WITH_BF_FTGL = True
BF_FTGL = '#extern/bFTGL'
BF_FTGL_INC = '${BF_FTGL}/include'
BF_FTGL_LIB = 'extern_ftgl'
-WITH_BF_GAMEENGINE='true'
-WITH_BF_PLAYER='true'
+WITH_BF_GAMEENGINE=True
+WITH_BF_PLAYER=True
-WITH_BF_ODE = 'false'
+WITH_BF_ODE = False
BF_ODE = LIBDIR + '/ode'
BF_ODE_INC = '${BF_ODE}/include'
BF_ODE_LIB = '${BF_ODE}/lib/libode.a'
-WITH_BF_BULLET = 'true'
+WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
@@ -169,9 +169,9 @@
BF_SOLID_INC = '${BF_SOLID}'
BF_SOLID_LIB = 'extern_solid'
-WITH_BF_YAFRAY = 'true'
+WITH_BF_YAFRAY = True
-#WITH_BF_NSPR = 'true'
+#WITH_BF_NSPR = True
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
#BF_NSPR_LIB =
@@ -186,7 +186,7 @@
# if this is not set.
#
# Be paranoid regarding library creation (do not update archives)
-#BF_PARANOID = 'true'
+#BF_PARANOID = True
# enable freetype2 support for text objects
BF_FREETYPE = LIBDIR + '/freetype'
@@ -194,16 +194,16 @@
BF_FREETYPE_LIB = 'freetype'
BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
-WITH_BF_QUICKTIME = 'true' # -DWITH_QUICKTIME
+WITH_BF_QUICKTIME = True # -DWITH_QUICKTIME
-WITH_BF_ICONV = 'true'
+WITH_BF_ICONV = True
BF_ICONV = LIBDIR + "/iconv"
BF_ICONV_INC = '${BF_ICONV}/include'
BF_ICONV_LIB = 'iconv'
#BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
# Mesa Libs should go here if your using them as well....
-WITH_BF_STATICOPENGL = 'true'
+WITH_BF_STATICOPENGL = True
BF_OPENGL_LIB = 'GL GLU'
BF_OPENGL_LIBPATH = '/System/Library/Frameworks/OpenGL.framework/Libraries'
BF_OPENGL_LINKFLAGS = '-framework OpenGL'
@@ -225,7 +225,7 @@
PLATFORM_LINKFLAGS = '-fuse-cxa-atexit '+PLATFORM_LINKFLAGS
LLIBS = LLIBS + ' crt3.o'
-if USE_SDK=='true':
+if USE_SDK==True:
SDK_FLAGS=['-isysroot', MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS]
PLATFORM_LINKFLAGS = '-mmacosx-version-min='+MAC_MIN_VERS+ ' -Wl,-syslibroot,' + MACOSX_SDK+" "+PLATFORM_LINKFLAGS
CCFLAGS=SDK_FLAGS+CCFLAGS
@@ -243,7 +243,7 @@
REL_CFLAGS = ['-O2']
REL_CCFLAGS = ['-O2']
-##BF_DEPEND = 'true'
+##BF_DEPEND = True
##
##AR = ar
##ARFLAGS = ruv
@@ -261,9 +261,9 @@
##DYNLDFLAGS = -shared $(LDFLAGS)
BF_PROFILE_FLAGS = ' -pg -g '
-BF_PROFILE = 'false'
+BF_PROFILE = False
-BF_DEBUG = 'false'
+BF_DEBUG = False
BF_DEBUG_FLAGS = '-g'
BF_BUILDDIR='../build/darwin'
Modified: branches/soc-2008-unclezeiv/config/linux2-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/linux2-config.py 2008-10-22 22:06:03 UTC (rev 17186)
+++ branches/soc-2008-unclezeiv/config/linux2-config.py 2008-10-22 22:29:24 UTC (rev 17187)
@@ -1,20 +1,20 @@
LCGDIR = '../lib/linux2'
LIBDIR = "${LCGDIR}"
-WITH_BF_VERSE = 'false'
+WITH_BF_VERSE = False
BF_VERSE_INCLUDE = "#extern/verse/dist"
BF_PYTHON = '/usr'
BF_PYTHON_VERSION = '2.5'
-WITH_BF_STATICPYTHON = 'false'
+WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}.a'
-WITH_BF_OPENAL = 'true'
-WITH_BF_STATICOPENAL = 'false'
+WITH_BF_OPENAL = True
+WITH_BF_STATICOPENAL = False
BF_OPENAL = '/usr'
BF_OPENAL_INC = '${BF_OPENAL}/include'
BF_OPENAL_LIB = 'openal'
@@ -26,19 +26,19 @@
# BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a ${BF_OPENAL}/lib/libalut.a'
BF_CXX = '/usr'
-WITH_BF_STATICCXX = 'false'
+WITH_BF_STATICCXX = False
BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-WITH_BF_SDL = 'true'
+WITH_BF_SDL = True
BF_SDL = '/usr' #$(shell sdl-config --prefix)
BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
-WITH_BF_FMOD = 'false'
+WITH_BF_FMOD = False
BF_FMOD = LIBDIR + '/fmod'
-WITH_BF_OPENEXR = 'true'
-WITH_BF_STATICOPENEXR = 'false'
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
BF_OPENEXR = '/usr'
# when compiling with your own openexr lib you might need to set...
# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
@@ -49,14 +49,14 @@
# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
-WITH_BF_DDS = 'true'
+WITH_BF_DDS = True
-WITH_BF_JPEG = 'true'
+WITH_BF_JPEG = True
BF_JPEG = '/usr'
BF_JPEG_INC = '${BF_JPEG}/include'
BF_JPEG_LIB = 'jpeg'
-WITH_BF_PNG = 'true'
+WITH_BF_PNG = True
BF_PNG = '/usr'
BF_PNG_INC = '${BF_PNG}/include'
BF_PNG_LIB = 'png'
@@ -64,31 +64,31 @@
BF_TIFF = '/usr'
BF_TIFF_INC = '${BF_TIFF}/include'
-WITH_BF_ZLIB = 'true'
+WITH_BF_ZLIB = True
BF_ZLIB = '/usr'
BF_ZLIB_INC = '${BF_ZLIB}/include'
BF_ZLIB_LIB = 'z'
-WITH_BF_INTERNATIONAL = 'true'
+WITH_BF_INTERNATIONAL = True
BF_GETTEXT = '/usr'
BF_GETTEXT_INC = '${BF_GETTEXT}/include'
BF_GETTEXT_LIB = 'gettextlib'
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-WITH_BF_FTGL = 'true'
+WITH_BF_FTGL = True
BF_FTGL = '#extern/bFTGL'
BF_FTGL_INC = '${BF_FTGL}/include'
BF_FTGL_LIB = 'extern_ftgl'
-WITH_BF_GAMEENGINE='false'
+WITH_BF_GAMEENGINE=False
-WITH_BF_ODE = 'false'
+WITH_BF_ODE = False
BF_ODE = LIBDIR + '/ode'
BF_ODE_INC = BF_ODE + '/include'
BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-WITH_BF_BULLET = 'true'
+WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
@@ -97,9 +97,9 @@
BF_SOLID_INC = '${BF_SOLID}'
BF_SOLID_LIB = 'extern_solid'
-WITH_BF_YAFRAY = 'true'
+WITH_BF_YAFRAY = True
-#WITH_BF_NSPR = 'true'
+#WITH_BF_NSPR = True
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
#BF_NSPR_LIB =
@@ -114,27 +114,27 @@
# if this is not set.
#
# Be paranoid regarding library creation (do not update archives)
-#BF_PARANOID = 'true'
+#BF_PARANOID = True
# enable freetype2 support for text objects
BF_FREETYPE = '/usr'
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
BF_FREETYPE_LIB = 'freetype'
-WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME
+WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
BF_QUICKTIME = '/usr/local'
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
-WITH_BF_ICONV = 'false'
+WITH_BF_ICONV = False
BF_ICONV = LIBDIR + "/iconv"
BF_ICONV_INC = '${BF_ICONV}/include'
BF_ICONV_LIB = 'iconv'
BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
-WITH_BF_BINRELOC = 'true'
+WITH_BF_BINRELOC = True
# enable ffmpeg support
-WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True # -DWITH_FFMPEG
BF_FFMPEG = '#extern/ffmpeg'
BF_FFMPEG_LIB = ''
# Uncomment the following two lines to use system's ffmpeg
@@ -144,30 +144,30 @@
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
# enable ogg, vorbis and theora in ffmpeg
-WITH_BF_OGG = 'false' # -DWITH_OGG
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list