Revision: 17853 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17853 Author: blendix Date: 2008-12-14 18:32:24 +0100 (Sun, 14 Dec 2008)
Log Message: ----------- 2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17434:HEAD Modified Paths: -------------- branches/blender2.5/blender/SConstruct branches/blender2.5/blender/config/darwin-config.py branches/blender2.5/blender/config/linux2-config.py branches/blender2.5/blender/config/linuxcross-config.py branches/blender2.5/blender/config/openbsd3-config.py branches/blender2.5/blender/config/sunos5-config.py branches/blender2.5/blender/config/win32-mingw-config.py branches/blender2.5/blender/config/win32-vc-config.py branches/blender2.5/blender/extern/Makefile branches/blender2.5/blender/intern/SoundSystem/Makefile branches/blender2.5/blender/intern/elbeem/intern/utilities.h branches/blender2.5/blender/intern/guardedalloc/BLO_sys_types.h branches/blender2.5/blender/intern/guardedalloc/intern/mmap_win.c branches/blender2.5/blender/intern/guardedalloc/mmap_win.h branches/blender2.5/blender/intern/opennl/superlu/BLO_sys_types.h branches/blender2.5/blender/projectfiles_vc9/blender/blender.sln branches/blender2.5/blender/projectfiles_vc9/blender/nodes/nodes.vcproj branches/blender2.5/blender/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj branches/blender2.5/blender/release/Makefile branches/blender2.5/blender/release/scripts/bpymodules/BPyImage.py branches/blender2.5/blender/release/scripts/bpymodules/BPyMathutils.py branches/blender2.5/blender/release/scripts/bpymodules/BPySys.py branches/blender2.5/blender/release/scripts/export_fbx.py branches/blender2.5/blender/release/scripts/import_dxf.py branches/blender2.5/blender/release/scripts/import_web3d.py branches/blender2.5/blender/source/Makefile branches/blender2.5/blender/source/blender/blenkernel/BKE_bmesh.h branches/blender2.5/blender/source/blender/blenkernel/BKE_bmeshCustomData.h branches/blender2.5/blender/source/blender/blenkernel/BKE_brush.h branches/blender2.5/blender/source/blender/blenkernel/BKE_bullet.h branches/blender2.5/blender/source/blender/blenkernel/BKE_customdata.h branches/blender2.5/blender/source/blender/blenkernel/BKE_node.h branches/blender2.5/blender/source/blender/blenkernel/BKE_suggestions.h branches/blender2.5/blender/source/blender/blenkernel/intern/BME_mesh.c branches/blender2.5/blender/source/blender/blenkernel/intern/BME_structure.c branches/blender2.5/blender/source/blender/blenkernel/intern/BME_tools.c branches/blender2.5/blender/source/blender/blenkernel/intern/bmesh_private.h branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c branches/blender2.5/blender/source/blender/blenkernel/intern/bullet.c branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c branches/blender2.5/blender/source/blender/blenkernel/intern/customdata.c branches/blender2.5/blender/source/blender/blenkernel/intern/displist.c branches/blender2.5/blender/source/blender/blenkernel/intern/node.c branches/blender2.5/blender/source/blender/blenkernel/intern/suggestions.c branches/blender2.5/blender/source/blender/blenlib/BLI_linklist.h branches/blender2.5/blender/source/blender/blenlib/BLI_memarena.h branches/blender2.5/blender/source/blender/blenlib/BLI_mempool.h branches/blender2.5/blender/source/blender/blenlib/SConscript branches/blender2.5/blender/source/blender/blenlib/intern/BLI_linklist.c branches/blender2.5/blender/source/blender/blenlib/intern/BLI_memarena.c branches/blender2.5/blender/source/blender/blenlib/intern/BLI_mempool.c branches/blender2.5/blender/source/blender/blenlib/intern/arithb.c branches/blender2.5/blender/source/blender/blenlib/intern/fnmatch.c branches/blender2.5/blender/source/blender/blenlib/intern/storage.c branches/blender2.5/blender/source/blender/blenlib/intern/threads.c branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c branches/blender2.5/blender/source/blender/gpu/intern/gpu_codegen.c branches/blender2.5/blender/source/blender/imbuf/IMB_imbuf.h branches/blender2.5/blender/source/blender/imbuf/intern/imageprocess.c branches/blender2.5/blender/source/blender/makesdna/DNA_customdata_types.h branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h branches/blender2.5/blender/source/blender/makesdna/DNA_scriptlink_types.h branches/blender2.5/blender/source/blender/makesdna/intern/SConscript branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt branches/blender2.5/blender/source/blender/nodes/TEX_node.h branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/Makefile branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_checker.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_curves.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_image.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_invert.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_output.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_proc.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_texture.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_translate.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_util.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_util.h branches/blender2.5/blender/source/creator/creator.c branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeActionActuator.h branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeDeformer.h branches/blender2.5/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.h branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ActuatorSensor.h branches/blender2.5/blender/source/gameengine/GameLogic/SCA_DelaySensor.cpp branches/blender2.5/blender/source/gameengine/GameLogic/SCA_DelaySensor.h branches/blender2.5/blender/source/gameengine/GameLogic/SCA_NANDController.cpp branches/blender2.5/blender/source/gameengine/GameLogic/SCA_NANDController.h branches/blender2.5/blender/source/gameengine/GameLogic/SCA_NORController.cpp branches/blender2.5/blender/source/gameengine/GameLogic/SCA_NORController.h branches/blender2.5/blender/source/gameengine/GameLogic/SCA_XNORController.cpp branches/blender2.5/blender/source/gameengine/GameLogic/SCA_XNORController.h branches/blender2.5/blender/source/gameengine/GameLogic/SCA_XORController.cpp branches/blender2.5/blender/source/gameengine/GameLogic/SCA_XORController.h branches/blender2.5/blender/source/gameengine/GamePlayer/common/unix/Makefile branches/blender2.5/blender/source/gameengine/GamePlayer/xembed/UnixShell.c branches/blender2.5/blender/source/gameengine/GamePlayer/xembed/blender_plugin_types.h branches/blender2.5/blender/source/gameengine/GamePlayer/xembed/npunix.c branches/blender2.5/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp branches/blender2.5/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.h branches/blender2.5/blender/source/gameengine/Ketsji/KX_Camera.cpp branches/blender2.5/blender/source/gameengine/Ketsji/KX_GameObject.cpp branches/blender2.5/blender/source/gameengine/Ketsji/KX_GameObject.h branches/blender2.5/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h branches/blender2.5/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp branches/blender2.5/blender/source/gameengine/Ketsji/KX_ParentActuator.h branches/blender2.5/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp branches/blender2.5/blender/source/gameengine/Ketsji/KX_PolyProxy.h branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h branches/blender2.5/blender/source/gameengine/Ketsji/KX_Scene.cpp branches/blender2.5/blender/source/gameengine/Ketsji/KX_StateActuator.cpp branches/blender2.5/blender/source/gameengine/Ketsji/KX_StateActuator.h branches/blender2.5/blender/source/gameengine/PyDoc/BL_ShapeActionActuator.py branches/blender2.5/blender/source/gameengine/PyDoc/KX_ActuatorSensor.py branches/blender2.5/blender/source/gameengine/PyDoc/KX_GameObject.py branches/blender2.5/blender/source/gameengine/PyDoc/KX_ParentActuator.py branches/blender2.5/blender/source/gameengine/PyDoc/KX_PolyProxy.py branches/blender2.5/blender/source/gameengine/PyDoc/KX_StateActuator.py branches/blender2.5/blender/source/gameengine/PyDoc/SCA_DelaySensor.py branches/blender2.5/blender/source/gameengine/PyDoc/SConscript branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_FramingManager.h branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_IRasterizer.h branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h branches/blender2.5/blender/source/gameengine/VideoTexture/Exception.cpp branches/blender2.5/blender/source/gameengine/VideoTexture/Exception.h branches/blender2.5/blender/source/gameengine/VideoTexture/ImageRender.cpp branches/blender2.5/blender/source/gameengine/VideoTexture/ImageRender.h branches/blender2.5/blender/source/gameengine/VideoTexture/ImageViewport.cpp branches/blender2.5/blender/source/gameengine/VideoTexture/ImageViewport.h branches/blender2.5/blender/source/gameengine/VideoTexture/Texture.h branches/blender2.5/blender/source/gameengine/VideoTexture/blendVideoTex.cpp branches/blender2.5/blender/source/nan_compile.mk branches/blender2.5/blender/source/nan_definitions.mk branches/blender2.5/blender/source/nan_link.mk branches/blender2.5/blender/tools/Blender.py branches/blender2.5/blender/tools/btools.py branches/blender2.5/blender/tools/crossmingw.py Added Paths: ----------- branches/blender2.5/blender/config/irix6-config.py branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_coord.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_distance.c Modified: branches/blender2.5/blender/SConstruct =================================================================== --- branches/blender2.5/blender/SConstruct 2008-12-14 17:25:46 UTC (rev 17852) +++ branches/blender2.5/blender/SConstruct 2008-12-14 17:32:24 UTC (rev 17853) @@ -249,7 +249,7 @@ # remove stdc++ from LLIBS if we are building a statc linked CXXFLAGS if env['WITH_BF_STATICCXX']: if 'stdc++' in env['LLIBS']: - env['LLIBS'] = env['LLIBS'].replace('stdc++', ' ') + env['LLIBS'].remove('stdc++') else: print '\tcould not remove stdc++ library from LLIBS, WITH_BF_STATICCXX may not work for your platform' @@ -425,8 +425,18 @@ dn.remove('CVS') if '.svn' in dn: dn.remove('.svn') + for f in df: - dotblendlist.append(dp+os.sep+f) + if not env['WITH_BF_INTERNATIONAL']: + if 'locale' in dp: + continue + if f == '.Blanguages': + continue + if not env['WITH_BF_FREETYPE']: + if f.endswith('.ttf'): + continue + + dotblendlist.append(os.path.join(dp, f)) dottargetlist.append(env['BF_INSTALLDIR']+dp[3:]+os.sep+f) dotblenderinstall = [] @@ -434,16 +444,17 @@ td, tf = os.path.split(targetdir) dotblenderinstall.append(env.Install(dir=td, source=srcfile)) - #-- .blender/scripts - scriptpath='release/scripts' - for dp, dn, df in os.walk(scriptpath): - if 'CVS' in dn: - dn.remove('CVS') - if '.svn' in dn: - dn.remove('.svn') - dir=env['BF_INSTALLDIR']+'/.blender/scripts'+dp[len(scriptpath):] - source=[dp+os.sep+f for f in df] - scriptinstall.append(env.Install(dir=dir,source=source)) + if env['WITH_BF_PYTHON']: + #-- .blender/scripts + scriptpath='release/scripts' + for dp, dn, df in os.walk(scriptpath): + if 'CVS' in dn: + dn.remove('CVS') + if '.svn' in dn: + dn.remove('.svn') + dir=env['BF_INSTALLDIR']+'/.blender/scripts'+dp[len(scriptpath):] + source=[dp+os.sep+f for f in df] + scriptinstall.append(env.Install(dir=dir,source=source)) #-- icons if env['OURPLATFORM']=='linux2': @@ -465,6 +476,13 @@ td, tf = os.path.split(targetdir) iconinstall.append(env.Install(dir=td, source=srcfile)) +# dlls for linuxcross +# TODO - add more libs, for now this lets blenderlite run +if env['OURPLATFORM']=='linuxcross': + dir=env['BF_INSTALLDIR'] + source = ['../lib/windows/pthreads/lib/pthreadGC2.dll'] + scriptinstall.append(env.Install(dir=dir, source=source)) + #-- plugins pluglist = [] plugtargetlist = [] Modified: branches/blender2.5/blender/config/darwin-config.py =================================================================== --- branches/blender2.5/blender/config/darwin-config.py 2008-12-14 17:25:46 UTC (rev 17852) +++ branches/blender2.5/blender/config/darwin-config.py 2008-12-14 17:32:24 UTC (rev 17853) @@ -216,14 +216,14 @@ PLATFORM_LINKFLAGS = '-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime' #note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4 -LLIBS = 'stdc++ SystemStubs' +LLIBS = ['stdc++', 'SystemStubs'] # some flags shuffling for different Os versions if MAC_MIN_VERS == '10.3': CFLAGS = ['-fuse-cxa-atexit']+CFLAGS CXXFLAGS = ['-fuse-cxa-atexit']+CXXFLAGS PLATFORM_LINKFLAGS = '-fuse-cxa-atexit '+PLATFORM_LINKFLAGS - LLIBS = LLIBS + ' crt3.o' + LLIBS.append('crt3.o') if USE_SDK==True: SDK_FLAGS=['-isysroot', MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS] @@ -261,6 +261,7 @@ ##DYNLDFLAGS = -shared $(LDFLAGS) BF_PROFILE_CCFLAGS = ['-pg', '-g '] +BF_PROFILE_LINKFLAGS = ['-pg'] BF_PROFILE = False BF_DEBUG = False Copied: branches/blender2.5/blender/config/irix6-config.py (from rev 17850, trunk/blender/config/irix6-config.py) =================================================================== --- branches/blender2.5/blender/config/irix6-config.py (rev 0) +++ branches/blender2.5/blender/config/irix6-config.py 2008-12-14 17:32:24 UTC (rev 17853) @@ -0,0 +1,231 @@ +import os + +LCGDIR = os.getcwd()+"/../lib/irix-6.5-mips" +LIBDIR = LCGDIR +print LCGDIR + +WITH_BF_VERSE = 'false' +BF_VERSE_INCLUDE = "#extern/verse/dist" + +BF_PYTHON = LCGDIR+'/python' +BF_PYTHON_VERSION = '2.5' +WITH_BF_STATICPYTHON = 'true' +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/python2.5/config/libpython${BF_PYTHON_VERSION}.a' + +WITH_BF_OPENAL = 'true' +WITH_BF_STATICOPENAL = 'true' +BF_OPENAL = LCGDIR+'/openal' +BF_OPENAL_INC = '${BF_OPENAL}/include' +BF_OPENAL_LIB = 'openal' +BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' +BF_OPENAL_LIBPATH = LIBDIR + '/lib' + +# some distros have a separate libalut +# if you get linker complaints, you need to uncomment the line below +# BF_OPENAL_LIB = 'openal alut' +# BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a ${BF_OPENAL}/lib/libalut.a' + +BF_CXX = '/usr' +WITH_BF_STATICCXX = 'false' +BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a' + +WITH_BF_SDL = 'true' +BF_SDL = LCGDIR+'/SDL' #$(shell sdl-config --prefix) +BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags) +BF_SDL_LIB = 'SDL audio iconv charset' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer +BF_SDL_LIBPATH = '${BF_SDL}/lib' + +WITH_BF_FMOD = 'false' +BF_FMOD = LIBDIR + '/fmod' + +WITH_BF_OPENEXR = 'false' +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' + +BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR' +BF_OPENEXR_LIB = 'Half IlmImf Iex Imath ' +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' +# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' + + +WITH_BF_DDS = 'false' + +WITH_BF_JPEG = 'false' +BF_JPEG = LCGDIR+'/jpeg' +BF_JPEG_INC = '${BF_JPEG}/include' +BF_JPEG_LIB = 'jpeg' +BF_JPEG_LIBPATH = '${BF_JPEG}/lib' + +WITH_BF_PNG = 'false' +BF_PNG = LCGDIR+"/png" +BF_PNG_INC = '${BF_PNG}/include' +BF_PNG_LIB = 'png' +BF_PNG_LIBPATH = '${BF_PNG}/lib' + +BF_TIFF = '/usr/nekoware' +BF_TIFF_INC = '${BF_TIFF}/include' + +WITH_BF_ZLIB = 'true' +BF_ZLIB = LCGDIR+"/zlib" +BF_ZLIB_INC = '${BF_ZLIB}/include' +BF_ZLIB_LIB = 'z' +BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib' + +WITH_BF_INTERNATIONAL = 'true' + +BF_GETTEXT = LCGDIR+'/gettext' +BF_GETTEXT_INC = '${BF_GETTEXT}/include' +BF_GETTEXT_LIB = 'gettextpo intl' +BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' + +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_ODE = 'false' +BF_ODE = LIBDIR + '/ode' +BF_ODE_INC = BF_ODE + '/include' +BF_ODE_LIB = BF_ODE + '/lib/libode.a' + +WITH_BF_BULLET = 'true' +BF_BULLET = '#extern/bullet2/src' +BF_BULLET_INC = '${BF_BULLET}' +BF_BULLET_LIB = 'extern_bullet' + +BF_SOLID = '#extern/solid' +BF_SOLID_INC = '${BF_SOLID}' +BF_SOLID_LIB = 'extern_solid' + +WITH_BF_YAFRAY = 'true' + +#WITH_BF_NSPR = 'true' +#BF_NSPR = $(LIBDIR)/nspr +#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr +#BF_NSPR_LIB = + +# Uncomment the following line to use Mozilla inplace of netscape +#CPPFLAGS += -DMOZ_NOT_NET +# Location of MOZILLA/Netscape header files... +#BF_MOZILLA = $(LIBDIR)/mozilla +#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl +#BF_MOZILLA_LIB = +# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB +# if this is not set. +# +# Be paranoid regarding library creation (do not update archives) +#BF_PARANOID = 'true' + +# enable freetype2 support for text objects +BF_FREETYPE = LCGDIR+'/freetype' +BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' +BF_FREETYPE_LIB = 'freetype' +BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib' + +WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME +BF_QUICKTIME = '/usr/local' +BF_QUICKTIME_INC = '${BF_QUICKTIME}/include' + +WITH_BF_ICONV = 'true' +BF_ICONV = LIBDIR + "/iconv" +BF_ICONV_INC = '${BF_ICONV}/include' +BF_ICONV_LIB = 'iconv charset' +BF_ICONV_LIBPATH = '${BF_ICONV}/lib' + +WITH_BF_BINRELOC = 'false' + +# enable ffmpeg support +WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG +# Uncomment the following two lines to use system's ffmpeg +BF_FFMPEG = LCGDIR+'/ffmpeg' +BF_FFMPEG_LIB = 'avformat avcodec swscale avutil faad faac vorbis x264 ogg mp3lame z' +BF_FFMPEG_INC = '${BF_FFMPEG}/include' +BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' + +# enable ogg, vorbis and theora in ffmpeg +WITH_BF_OGG = 'false' # -DWITH_OGG +BF_OGG = '/usr' +BF_OGG_INC = '${BF_OGG}/include' +BF_OGG_LIB = 'ogg vorbis theoraenc theoradec' + +WITH_BF_OPENJPEG = 'false' +BF_OPENJPEG = '#extern/libopenjpeg' +BF_OPENJPEG_LIB = '' +BF_OPENJPEG_INC = '${BF_OPENJPEG}/include' +BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib' + +WITH_BF_REDCODE = 'false' +BF_REDCODE = '#extern/libredcode' +BF_REDCODE_LIB = '' +BF_REDCODE_INC = '${BF_REDCODE}/include' +BF_REDCODE_LIBPATH='${BF_REDCODE}/lib' + +# Mesa Libs should go here if your using them as well.... +WITH_BF_STATICOPENGL = 'false' +BF_OPENGL = '/usr' +BF_OPENGL_INC = '${BF_OPENGL}/include' +BF_OPENGL_LIB = 'GL GLU X11 Xi Xext' +BF_OPENGL_LIBPATH = '/usr/X11R6/lib' +BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/libGL.a ${BF_OPENGL}/libGLU.a ${BF_OPENGL}/libXxf86vm.a ${BF_OPENGL}/libX11.a ${BF_OPENGL}/libXi.a ${BF_OPENGL}/libXext.a ${BF_OPENGL}/libXxf86vm.a' + + +CC = 'c99' +CXX = 'CC' + + +CCFLAGS = ['-pipe','-fPIC', '-n32'] + +CPPFLAGS = ['-DXP_UNIX'] +CXXFLAGS = ['-pipe','-fPIC', '-n32'] +REL_CFLAGS = ['-O2'] +REL_CCFLAGS = ['-O2'] +##BF_DEPEND = 'true' +## +##AR = ar +##ARFLAGS = ruv +##ARFLAGSQUIET = ru +## +C_WARN = '-no_prelink -ptused' + +CC_WARN = '-no_prelink -ptused' + +##FIX_STUBS_WARNINGS = -Wno-unused + +LLIBS = 'c m dl pthread dmedia movie' +##LOPTS = --dynamic +##DYNLDFLAGS = -shared $(LDFLAGS) + +BF_PROFILE_FLAGS = ['-pg','-g'] +BF_PROFILE = 'false' + +BF_DEBUG = 'false' +BF_DEBUG_FLAGS = '-g' @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs