[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14621] branches/apricot:

Brecht Van Lommel brechtvanlommel at pandora.be
Wed Apr 30 14:28:05 CEST 2008


Revision: 14621
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14621
Author:   blendix
Date:     2008-04-30 14:27:13 +0200 (Wed, 30 Apr 2008)

Log Message:
-----------

Apricot Branch
==============

svn merge -r 14561:14620

Modified Paths:
--------------
    branches/apricot/CMakeLists.txt
    branches/apricot/SConstruct
    branches/apricot/config/darwin-config.py
    branches/apricot/doc/blender-scons.txt
    branches/apricot/extern/verse/dist/v_network.c
    branches/apricot/extern/x264/SConscript
    branches/apricot/extern/xvidcore/SConscript
    branches/apricot/intern/guardedalloc/intern/mallocn.c
    branches/apricot/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
    branches/apricot/release/scripts/bpymodules/paths_svg2obj.py
    branches/apricot/release/scripts/raw_export.py
    branches/apricot/source/blender/blenkernel/BKE_blender.h
    branches/apricot/source/blender/blenkernel/BKE_cloth.h
    branches/apricot/source/blender/blenkernel/bad_level_call_stubs/stubs.c
    branches/apricot/source/blender/blenkernel/intern/action.c
    branches/apricot/source/blender/blenkernel/intern/anim.c
    branches/apricot/source/blender/blenkernel/intern/image.c
    branches/apricot/source/blender/blenkernel/intern/implicit.c
    branches/apricot/source/blender/blenkernel/intern/object.c
    branches/apricot/source/blender/blenkernel/intern/scene.c
    branches/apricot/source/blender/blenlib/BLI_winstuff.h
    branches/apricot/source/blender/blenlib/intern/noise.c
    branches/apricot/source/blender/blenlib/intern/psfont.c
    branches/apricot/source/blender/blenlib/intern/util.c
    branches/apricot/source/blender/blenlib/intern/winstuff.c
    branches/apricot/source/blender/blenloader/intern/readfile.c
    branches/apricot/source/blender/blenpluginapi/intern/pluginapi.c
    branches/apricot/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/apricot/source/blender/imbuf/intern/radiance_hdr.c
    branches/apricot/source/blender/imbuf/intern/readimage.c
    branches/apricot/source/blender/include/BIF_editaction.h
    branches/apricot/source/blender/makesdna/DNA_action_types.h
    branches/apricot/source/blender/makesdna/DNA_cloth_types.h
    branches/apricot/source/blender/makesdna/intern/CMakeLists.txt
    branches/apricot/source/blender/makesdna/intern/SConscript
    branches/apricot/source/blender/python/BPY_interface.c
    branches/apricot/source/blender/python/api2_2x/Effect.c
    branches/apricot/source/blender/python/api2_2x/MTex.c
    branches/apricot/source/blender/python/api2_2x/doc/Texture.py
    branches/apricot/source/blender/render/intern/source/pipeline.c
    branches/apricot/source/blender/render/intern/source/rayshade.c
    branches/apricot/source/blender/render/intern/source/rendercore.c
    branches/apricot/source/blender/render/intern/source/shadeoutput.c
    branches/apricot/source/blender/src/B.blend.c
    branches/apricot/source/blender/src/buttons_object.c
    branches/apricot/source/blender/src/buttons_scene.c
    branches/apricot/source/blender/src/buttons_shading.c
    branches/apricot/source/blender/src/drawaction.c
    branches/apricot/source/blender/src/drawimage.c
    branches/apricot/source/blender/src/drawimasel.c
    branches/apricot/source/blender/src/drawipo.c
    branches/apricot/source/blender/src/drawscene.c
    branches/apricot/source/blender/src/editaction.c
    branches/apricot/source/blender/src/editipo.c
    branches/apricot/source/blender/src/filesel.c
    branches/apricot/source/blender/src/header_action.c
    branches/apricot/source/blender/src/header_image.c
    branches/apricot/source/blender/src/outliner.c
    branches/apricot/source/blender/src/poselib.c
    branches/apricot/source/blender/src/transform_conversions.c
    branches/apricot/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/apricot/source/gameengine/GamePlayer/common/SConscript
    branches/apricot/source/gameengine/GamePlayer/ghost/SConscript
    branches/apricot/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
    branches/apricot/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    branches/apricot/source/gameengine/Rasterizer/SConscript
    branches/apricot/tools/btools.py

Added Paths:
-----------
    branches/apricot/intern/guardedalloc/intern/mmap_win.c
    branches/apricot/intern/guardedalloc/mmap_win.h
    branches/apricot/source/gameengine/BlenderRoutines/mac_compat_glext.h

Modified: branches/apricot/CMakeLists.txt
===================================================================
--- branches/apricot/CMakeLists.txt	2008-04-30 12:02:09 UTC (rev 14620)
+++ branches/apricot/CMakeLists.txt	2008-04-30 12:27:13 UTC (rev 14621)
@@ -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)

Modified: branches/apricot/SConstruct
===================================================================
--- branches/apricot/SConstruct	2008-04-30 12:02:09 UTC (rev 14620)
+++ branches/apricot/SConstruct	2008-04-30 12:27:13 UTC (rev 14621)
@@ -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,21 +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.Append(LINKFLAGS=['-lgomp'])
-			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
 
@@ -264,10 +264,18 @@
     if os.path.exists(B.root_build_dir):
         print B.bc.HEADER+'Cleaning...'+B.bc.ENDC
         dirs = os.listdir(B.root_build_dir)
-        for dir in dirs:
-            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 entry in dirs:
+            if os.path.isdir(B.root_build_dir + entry) == 1:
+                print "clean dir %s"%(B.root_build_dir+entry)
+                shutil.rmtree(B.root_build_dir+entry)
+            else: # remove file
+                print "remove file %s"%(B.root_build_dir+entry)
+                os.remove(B.root_build_dir+entry)
+        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
@@ -356,30 +364,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 = []
@@ -411,9 +419,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',
@@ -436,8 +444,12 @@
     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)
@@ -463,7 +475,7 @@
 Default(B.program_list)
 
 if not env['WITHOUT_BF_INSTALL']:
-	Default(installtarget)
+        Default(installtarget)
 
 #------------ RELEASE
 # TODO: zipup the installation

Modified: branches/apricot/config/darwin-config.py
===================================================================
--- branches/apricot/config/darwin-config.py	2008-04-30 12:02:09 UTC (rev 14620)
+++ branches/apricot/config/darwin-config.py	2008-04-30 12:27:13 UTC (rev 14621)
@@ -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 
+#
+# if you want py2.5 on leopard without installing
+# change value to BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
+# BEWARE: in that case it will work only on leopard
+
 if BF_PYTHON_VERSION=='2.3':
 	BF_PYTHON = '/System/Library/Frameworks/Python.framework/Versions/'
 else:
@@ -25,15 +67,27 @@
 BF_PYTHON_BINARY = '${BF_PYTHON}${BF_PYTHON_VERSION}/bin/python${BF_PYTHON_VERSION}'
 BF_PYTHON_LIB = ''
 BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config'
-BF_PYTHON_LINKFLAGS = '-u __dummy -u _PyMac_Error -framework System -framework Python'

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list