Revision: 14599 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14599 Author: mxcurioni Date: 2008-04-28 18:21:26 +0200 (Mon, 28 Apr 2008)
Log Message: ----------- Merged changes from trunk to soc-2008-mxcurioni: svn merge -r 14534:14595 https://svn.blender.org/svnroot/bf-blender/trunk/blender/ Modified Paths: -------------- branches/soc-2008-mxcurioni/CMakeLists.txt branches/soc-2008-mxcurioni/SConstruct branches/soc-2008-mxcurioni/config/darwin-config.py branches/soc-2008-mxcurioni/doc/blender-scons.txt branches/soc-2008-mxcurioni/extern/ffmpeg/SConscript branches/soc-2008-mxcurioni/extern/verse/dist/v_network.c branches/soc-2008-mxcurioni/extern/x264/SConscript branches/soc-2008-mxcurioni/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj branches/soc-2008-mxcurioni/projectfiles_vc7/blender/blender.vcproj branches/soc-2008-mxcurioni/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj branches/soc-2008-mxcurioni/projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj branches/soc-2008-mxcurioni/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj branches/soc-2008-mxcurioni/projectfiles_vc7/blender/src/BL_src.vcproj branches/soc-2008-mxcurioni/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj branches/soc-2008-mxcurioni/release/datafiles/datatoc.c branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_cloth.h branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_effect.h branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_font.h branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_multires.h branches/soc-2008-mxcurioni/source/blender/blenkernel/bad_level_call_stubs/stubs.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/font.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/group.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/implicit.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires-firstlevel.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_blenlib.h branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_bpath.h branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c branches/soc-2008-mxcurioni/source/blender/blenlib/intern/util.c branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c branches/soc-2008-mxcurioni/source/blender/ftfont/intern/FTF_TTFont.cpp branches/soc-2008-mxcurioni/source/blender/imbuf/intern/util.c branches/soc-2008-mxcurioni/source/blender/include/BIF_editaction.h branches/soc-2008-mxcurioni/source/blender/include/BSE_sequence.h branches/soc-2008-mxcurioni/source/blender/include/blendef.h branches/soc-2008-mxcurioni/source/blender/include/butspace.h branches/soc-2008-mxcurioni/source/blender/include/particle_effect.h branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_cloth_types.h branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c branches/soc-2008-mxcurioni/source/blender/python/BPY_interface.c branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Blender.c branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Effect.c branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Node.c branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Object.c branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Particle.c branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/Effect.py branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/Object.py branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c branches/soc-2008-mxcurioni/source/blender/src/B.blend.c branches/soc-2008-mxcurioni/source/blender/src/buttons_object.c branches/soc-2008-mxcurioni/source/blender/src/buttons_scene.c branches/soc-2008-mxcurioni/source/blender/src/drawaction.c branches/soc-2008-mxcurioni/source/blender/src/drawimage.c branches/soc-2008-mxcurioni/source/blender/src/drawimasel.c branches/soc-2008-mxcurioni/source/blender/src/drawobject.c branches/soc-2008-mxcurioni/source/blender/src/drawscene.c branches/soc-2008-mxcurioni/source/blender/src/editaction.c branches/soc-2008-mxcurioni/source/blender/src/editfont.c branches/soc-2008-mxcurioni/source/blender/src/editipo.c branches/soc-2008-mxcurioni/source/blender/src/editobject.c branches/soc-2008-mxcurioni/source/blender/src/editscreen.c branches/soc-2008-mxcurioni/source/blender/src/header_action.c branches/soc-2008-mxcurioni/source/blender/src/header_image.c branches/soc-2008-mxcurioni/source/blender/src/header_view3d.c branches/soc-2008-mxcurioni/source/blender/src/meshtools.c branches/soc-2008-mxcurioni/source/blender/src/outliner.c branches/soc-2008-mxcurioni/source/blender/src/poselib.c branches/soc-2008-mxcurioni/source/blender/src/toets.c branches/soc-2008-mxcurioni/source/blender/src/transform_conversions.c branches/soc-2008-mxcurioni/source/blender/src/usiblender.c branches/soc-2008-mxcurioni/source/blender/src/view.c branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt branches/soc-2008-mxcurioni/source/creator/creator.c branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IActuator.h branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IObject.cpp branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IObject.h branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_LogicManager.cpp branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TrackToActuator.cpp branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TrackToActuator.h branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp branches/soc-2008-mxcurioni/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Callback.h branches/soc-2008-mxcurioni/tools/btools.py Modified: branches/soc-2008-mxcurioni/CMakeLists.txt =================================================================== --- branches/soc-2008-mxcurioni/CMakeLists.txt 2008-04-28 16:14:31 UTC (rev 14598) +++ branches/soc-2008-mxcurioni/CMakeLists.txt 2008-04-28 16:21:26 UTC (rev 14599) @@ -60,7 +60,7 @@ OPTION(WITH_VERSE "Enable Verse (http://verse.blender.org)" OFF) OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)" ON) OPTION(WITH_QUICKTIME "Enable Quicktime Support" OFF) -OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" OFF) +OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON) OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF) OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON) OPTION(YESIAMSTUPID "Enable execution on 64-bit platforms" OFF) @@ -258,7 +258,7 @@ SET(FFMPEG ${LIBDIR}/ffmpeg) SET(FFMPEG_INC ${FFMPEG}/include) - SET(FFMPEG_LIB avcodec-51 avformat-51 avutil-49) + SET(FFMPEG_LIB avcodec-51 avformat-52 avdevice-52 avutil-49 swscale-0) SET(FFMPEG_LIBPATH ${FFMPEG}/lib) SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm) @@ -299,7 +299,7 @@ SET(WINTAB_INC ${LIBDIR}/wintab/include) SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib") - SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib ") + SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ") ENDIF(WIN32) IF(APPLE) Modified: branches/soc-2008-mxcurioni/SConstruct =================================================================== --- branches/soc-2008-mxcurioni/SConstruct 2008-04-28 16:14:31 UTC (rev 14598) +++ branches/soc-2008-mxcurioni/SConstruct 2008-04-28 16:21:26 UTC (rev 14599) @@ -143,7 +143,7 @@ env['OURPLATFORM'] = platform -configfile = B.arguments.get('BF_CONFIG', 'config'+os.sep+platform+'-config.py') +configfile = 'config'+os.sep+platform+'-config.py' if os.path.exists(configfile): print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + configfile @@ -157,13 +157,14 @@ # Needed for gui programs, console programs should do without it env.Append(LINKFLAGS=['-mwindows']) +userconfig = B.arguments.get('BF_CONFIG', 'user-config.py') # first read platform config. B.arguments will override optfiles = [configfile] -if os.path.exists('user-config.py'): - print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + 'user-config.py' - optfiles += ['user-config.py'] +if os.path.exists(userconfig): + print B.bc.OKGREEN + "Using user-config file: " + B.bc.ENDC + userconfig + optfiles += [userconfig] else: - print B.bc.WARNING + 'user-config.py' + " not found, no user overrides" + B.bc.ENDC + print B.bc.WARNING + userconfig + " not found, no user overrides" + B.bc.ENDC opts = btools.read_opts(optfiles, B.arguments) opts.Update(env) @@ -178,20 +179,20 @@ env['CCFLAGS'].append('-DDISABLE_ELBEEM') if env['WITH_BF_OPENMP'] == 1: - if env['OURPLATFORM']=='win32-vc': - env['CCFLAGS'].append('/openmp') - env['CPPFLAGS'].append('/openmp') - env['CXXFLAGS'].append('/openmp') - else: - if env['CC'] == 'icc': - env.Append(LINKFLAGS=['-openmp', '-static-intel']) - env['CCFLAGS'].append('-openmp') - env['CPPFLAGS'].append('-openmp') - env['CXXFLAGS'].append('-openmp') - else: - env['CCFLAGS'].append('-fopenmp') - env['CPPFLAGS'].append('-fopenmp') - env['CXXFLAGS'].append('-fopenmp') + if env['OURPLATFORM']=='win32-vc': + env['CCFLAGS'].append('/openmp') + env['CPPFLAGS'].append('/openmp') + env['CXXFLAGS'].append('/openmp') + else: + if env['CC'] == 'icc': + env.Append(LINKFLAGS=['-openmp', '-static-intel']) + env['CCFLAGS'].append('-openmp') + env['CPPFLAGS'].append('-openmp') + env['CXXFLAGS'].append('-openmp') + else: + env['CCFLAGS'].append('-fopenmp') + env['CPPFLAGS'].append('-fopenmp') + env['CXXFLAGS'].append('-fopenmp') #check for additional debug libnames @@ -267,6 +268,11 @@ if os.path.isdir(B.root_build_dir + dir) == 1: print "clean dir %s"%(B.root_build_dir+dir) shutil.rmtree(B.root_build_dir+dir) + for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak', + 'extern/xvidcore/build/generic/platform.inc']: + if os.path.exists(confile): + print "clean file %s"%confile + os.remove(confile) print B.bc.OKGREEN+'...done'+B.bc.ENDC else: print B.bc.HEADER+'Already Clean, nothing to do.'+B.bc.ENDC @@ -355,30 +361,30 @@ scriptinstall = [] if env['OURPLATFORM']!='darwin': - for dp, dn, df in os.walk('bin/.blender'): - if 'CVS' in dn: - dn.remove('CVS') - if '.svn' in dn: - dn.remove('.svn') - for f in df: - dotblendlist.append(dp+os.sep+f) - dottargetlist.append(env['BF_INSTALLDIR']+dp[3:]+os.sep+f) + for dp, dn, df in os.walk('bin/.blender'): + if 'CVS' in dn: + dn.remove('CVS') + if '.svn' in dn: + dn.remove('.svn') + for f in df: + dotblendlist.append(dp+os.sep+f) + dottargetlist.append(env['BF_INSTALLDIR']+dp[3:]+os.sep+f) - dotblenderinstall = [] - for targetdir,srcfile in zip(dottargetlist, dotblendlist): - 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)) + dotblenderinstall = [] + for targetdir,srcfile in zip(dottargetlist, dotblendlist): + 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)) #-- plugins pluglist = [] @@ -410,9 +416,9 @@ textinstall = env.Install(dir=env['BF_INSTALLDIR'], source=textlist) if env['OURPLATFORM']=='darwin': - allinstall = [blenderinstall, plugininstall, textinstall] + allinstall = [blenderinstall, plugininstall, textinstall] else: - allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall] + allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall] if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll', @@ -432,10 +438,17 @@ dllsources += ['${LCGDIR}/pthreads/lib/pthreadVC2.dll'] if env['WITH_BF_ICONV']: dllsources += ['${LCGDIR}/iconv/lib/iconv.dll'] -# if env['WITH_BF_FFMPEG']: -# dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll', -# '${LCGDIR}/ffmpeg/lib/avformat-51.dll', -# '${LCGDIR}/ffmpeg/lib/avutil-49.dll'] + if env['WITH_BF_FFMPEG']: + dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll', + '${LCGDIR}/ffmpeg/lib/avformat-52.dll', + '${LCGDIR}/ffmpeg/lib/avdevice-52.dll', + '${LCGDIR}/ffmpeg/lib/avutil-49.dll', + '${LCGDIR}/ffmpeg/lib/libfaad-0.dll', + '${LCGDIR}/ffmpeg/lib/libfaac-0.dll', + '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll', + '${LCGDIR}/ffmpeg/lib/libx264-59.dll', + '${LCGDIR}/ffmpeg/lib/xvidcore.dll', + '${LCGDIR}/ffmpeg/lib/swscale-0.dll'] windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources) allinstall += windlls @@ -459,7 +472,7 @@ Default(B.program_list) if not env['WITHOUT_BF_INSTALL']: - Default(installtarget) + Default(installtarget) #------------ RELEASE # TODO: zipup the installation Modified: branches/soc-2008-mxcurioni/config/darwin-config.py =================================================================== --- branches/soc-2008-mxcurioni/config/darwin-config.py 2008-04-28 16:14:31 UTC (rev 14598) +++ branches/soc-2008-mxcurioni/config/darwin-config.py 2008-04-28 16:21:26 UTC (rev 14599) @@ -1,10 +1,48 @@ -LCGDIR = '#../lib/darwin-6.1-powerpc' +# +# Note : if you want to alter this file +# copy it as a whole in the upper folder +# as user-config.py +# dont create a new file with only some +# vars changed. + +import commands + +# IMPORTANT NOTE : OFFICIAL BUILDS SHOULD BE DONE WITH SDKs +USE_SDK='true' + +BF_PYTHON_VERSION = '2.3' + +cmd = 'uname -p' +MAC_PROC=commands.getoutput(cmd) +cmd = 'uname -r' +cmd_res=commands.getoutput(cmd) +if cmd_res[0]=='7': + MAC_CUR_VER='10.3' +elif cmd_res[0]=='8': + MAC_CUR_VER='10.4' +else: + MAC_CUR_VER='10.5' + +if MAC_PROC == 'powerpc': + LCGDIR = '#../lib/darwin-6.1-powerpc' +else : + LCGDIR = '#../lib/darwin-8.x.i386' LIBDIR = '${LCGDIR}' +if MAC_PROC== 'powerpc' and BF_PYTHON_VERSION == '2.3': + MAC_MIN_VERS = '10.3' + MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk' +else: + MAC_MIN_VERS = '10.4' + MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk' + + # enable ffmpeg support WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG BF_FFMPEG = "#extern/ffmpeg" BF_FFMPEG_INC = '${BF_FFMPEG}/include' +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' @@ -14,8 +52,12 @@ BF_VERSE_INCLUDE = BF_VERSE BF_VERSE_LIBS = "libverse" -# python.org libs install in /library -BF_PYTHON_VERSION = '2.5' +# python.org libs install in /library we want to use that for 2.5 +# @@ 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