[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24153] branches/sculpt25: Sculpt: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r24095 :24152
Brecht Van Lommel
brecht at blender.org
Thu Oct 29 11:12:08 CET 2009
Revision: 24153
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24153
Author: blendix
Date: 2009-10-29 11:12:07 +0100 (Thu, 29 Oct 2009)
Log Message:
-----------
Sculpt: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r24095:24152
Modified Paths:
--------------
branches/sculpt25/CMakeLists.txt
branches/sculpt25/config/darwin-config.py
branches/sculpt25/intern/ghost/SConscript
branches/sculpt25/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/sculpt25/release/scripts/io/export_3ds.py
branches/sculpt25/release/scripts/io/import_3ds.py
branches/sculpt25/release/scripts/modules/bpy_ops.py
branches/sculpt25/release/scripts/ui/buttons_physics_cloth.py
branches/sculpt25/release/scripts/ui/buttons_world.py
branches/sculpt25/release/scripts/ui/space_info.py
branches/sculpt25/release/scripts/ui/space_view3d.py
branches/sculpt25/release/scripts/ui/space_view3d_toolbar.py
branches/sculpt25/source/blender/blenfont/intern/blf.c
branches/sculpt25/source/blender/blenkernel/BKE_armature.h
branches/sculpt25/source/blender/blenkernel/BKE_context.h
branches/sculpt25/source/blender/blenkernel/BKE_fcurve.h
branches/sculpt25/source/blender/blenkernel/intern/anim.c
branches/sculpt25/source/blender/blenkernel/intern/armature.c
branches/sculpt25/source/blender/blenkernel/intern/context.c
branches/sculpt25/source/blender/blenkernel/intern/sequence.c
branches/sculpt25/source/blender/blenlib/BLI_arithb.h
branches/sculpt25/source/blender/blenlib/intern/arithb.c
branches/sculpt25/source/blender/blenloader/intern/readfile.c
branches/sculpt25/source/blender/blenloader/intern/writefile.c
branches/sculpt25/source/blender/editors/animation/keyframing.c
branches/sculpt25/source/blender/editors/animation/keyingsets.c
branches/sculpt25/source/blender/editors/armature/armature_ops.c
branches/sculpt25/source/blender/editors/armature/editarmature.c
branches/sculpt25/source/blender/editors/datafiles/B.blend.c
branches/sculpt25/source/blender/editors/include/ED_armature.h
branches/sculpt25/source/blender/editors/include/ED_keyframing.h
branches/sculpt25/source/blender/editors/include/ED_view3d.h
branches/sculpt25/source/blender/editors/interface/interface_anim.c
branches/sculpt25/source/blender/editors/interface/interface_handlers.c
branches/sculpt25/source/blender/editors/interface/interface_intern.h
branches/sculpt25/source/blender/editors/interface/interface_layout.c
branches/sculpt25/source/blender/editors/interface/interface_templates.c
branches/sculpt25/source/blender/editors/interface/interface_utils.c
branches/sculpt25/source/blender/editors/mesh/editmesh_tools.c
branches/sculpt25/source/blender/editors/mesh/mesh_intern.h
branches/sculpt25/source/blender/editors/mesh/mesh_ops.c
branches/sculpt25/source/blender/editors/object/object_add.c
branches/sculpt25/source/blender/editors/object/object_edit.c
branches/sculpt25/source/blender/editors/object/object_relations.c
branches/sculpt25/source/blender/editors/object/object_transform.c
branches/sculpt25/source/blender/editors/object/object_vgroup.c
branches/sculpt25/source/blender/editors/physics/particle_edit.c
branches/sculpt25/source/blender/editors/screen/Makefile
branches/sculpt25/source/blender/editors/screen/SConscript
branches/sculpt25/source/blender/editors/screen/screen_edit.c
branches/sculpt25/source/blender/editors/screen/screen_ops.c
branches/sculpt25/source/blender/editors/space_api/spacetypes.c
branches/sculpt25/source/blender/editors/space_buttons/buttons_context.c
branches/sculpt25/source/blender/editors/space_graph/graph_buttons.c
branches/sculpt25/source/blender/editors/space_node/drawnode.c
branches/sculpt25/source/blender/editors/space_node/space_node.c
branches/sculpt25/source/blender/editors/space_sequencer/sequencer_edit.c
branches/sculpt25/source/blender/editors/space_sequencer/sequencer_intern.h
branches/sculpt25/source/blender/editors/space_sequencer/sequencer_ops.c
branches/sculpt25/source/blender/editors/space_view3d/view3d_draw.c
branches/sculpt25/source/blender/editors/space_view3d/view3d_edit.c
branches/sculpt25/source/blender/editors/space_view3d/view3d_header.c
branches/sculpt25/source/blender/editors/space_view3d/view3d_ops.c
branches/sculpt25/source/blender/editors/space_view3d/view3d_snap.c
branches/sculpt25/source/blender/editors/space_view3d/view3d_view.c
branches/sculpt25/source/blender/editors/transform/transform.c
branches/sculpt25/source/blender/editors/transform/transform_constraints.c
branches/sculpt25/source/blender/editors/transform/transform_conversions.c
branches/sculpt25/source/blender/editors/transform/transform_generics.c
branches/sculpt25/source/blender/editors/transform/transform_manipulator.c
branches/sculpt25/source/blender/editors/transform/transform_orientations.c
branches/sculpt25/source/blender/gpu/GPU_extensions.h
branches/sculpt25/source/blender/gpu/intern/gpu_extensions.c
branches/sculpt25/source/blender/gpu/intern/gpu_material.c
branches/sculpt25/source/blender/makesdna/DNA_armature_types.h
branches/sculpt25/source/blender/makesdna/DNA_view3d_types.h
branches/sculpt25/source/blender/makesrna/RNA_access.h
branches/sculpt25/source/blender/makesrna/intern/rna_access.c
branches/sculpt25/source/blender/makesrna/intern/rna_armature.c
branches/sculpt25/source/blender/makesrna/intern/rna_curve.c
branches/sculpt25/source/blender/makesrna/intern/rna_nodetree.c
branches/sculpt25/source/blender/makesrna/intern/rna_space.c
branches/sculpt25/source/blender/makesrna/intern/rna_texture.c
branches/sculpt25/source/blender/makesrna/intern/rna_wm_api.c
branches/sculpt25/source/blender/python/intern/bpy_interface.c
branches/sculpt25/source/blender/python/intern/bpy_operator.c
branches/sculpt25/source/blender/python/intern/bpy_rna.c
branches/sculpt25/source/blender/windowmanager/intern/wm_operators.c
branches/sculpt25/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/sculpt25/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/sculpt25/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/sculpt25/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/sculpt25/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/sculpt25/tools/Blender.py
branches/sculpt25/tools/btools.py
Added Paths:
-----------
branches/sculpt25/release/scripts/modules/bpy_ext/
branches/sculpt25/release/scripts/modules/bpy_ext/Object.py
branches/sculpt25/release/scripts/modules/bpy_ext/__init__.py
Removed Paths:
-------------
branches/sculpt25/release/scripts/modules/bpy_ext/Object.py
branches/sculpt25/release/scripts/modules/bpy_ext/__init__.py
Modified: branches/sculpt25/CMakeLists.txt
===================================================================
--- branches/sculpt25/CMakeLists.txt 2009-10-29 10:03:34 UTC (rev 24152)
+++ branches/sculpt25/CMakeLists.txt 2009-10-29 10:12:07 UTC (rev 24153)
@@ -540,13 +540,19 @@
IF(UNIX)
EXEC_PROGRAM("date \"+%Y-%m-%d\"" OUTPUT_VARIABLE BUILD_DATE)
EXEC_PROGRAM("date \"+%H:%M:%S\"" OUTPUT_VARIABLE BUILD_TIME)
- EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV)
+ EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV RETURN_VALUE BUILD_REV_RETURN)
+ IF(BUILD_REV_RETURN)
+ SET(BUILD_REV "unknown")
+ ENDIF(BUILD_REV_RETURN)
ENDIF(UNIX)
IF(WIN32)
EXEC_PROGRAM("cmd /c date /t" OUTPUT_VARIABLE BUILD_DATE)
EXEC_PROGRAM("cmd /c time /t" OUTPUT_VARIABLE BUILD_TIME)
- EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV)
+ EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV RETURN_VALUE BUILD_REV_RETURN)
+ IF(BUILD_REV_RETURN)
+ SET(BUILD_REV "unknown")
+ ENDIF(BUILD_REV_RETURN)
ENDIF(WIN32)
ENDIF(WITH_BUILDINFO)
Modified: branches/sculpt25/config/darwin-config.py
===================================================================
--- branches/sculpt25/config/darwin-config.py 2009-10-29 10:03:34 UTC (rev 24152)
+++ branches/sculpt25/config/darwin-config.py 2009-10-29 10:12:07 UTC (rev 24153)
@@ -1,3 +1,10 @@
+#
+# 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
@@ -3,4 +10,12 @@
USE_SDK=True
+#############################################################################
+################### Cocoa & architecture settings ##################
+#############################################################################
+
+WITH_GHOST_COCOA=True
+MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64
+
+
cmd = 'uname -p'
MAC_PROC=commands.getoutput(cmd)
@@ -11,28 +26,42 @@
MAC_CUR_VER='10.3'
elif cmd_res[0]=='8':
MAC_CUR_VER='10.4'
-else:
+elif cmd_res[0]=='9':
MAC_CUR_VER='10.5'
+elif cmd_res[0]=='10':
+ MAC_CUR_VER='10.6'
if MAC_PROC == 'powerpc':
LCGDIR = '#../lib/darwin-6.1-powerpc'
else :
- LCGDIR = '#../lib/darwin-8.x.i386'
+ LCGDIR = '#../lib/darwin-9.x.universal'
LIBDIR = '${LCGDIR}'
BF_PYTHON_VERSION = '3.1'
-if MAC_PROC== 'powerpc' and BF_PYTHON_VERSION == '2.3':
+if MAC_PROC == 'powerpc' and BF_PYTHON_VERSION == '2.3':
MAC_MIN_VERS = '10.3'
MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
-else:
+ CC = 'gcc'
+ CXX = 'g++'
+elif MACOSX_ARCHITECTURE == 'i386' or MACOSX_ARCHITECTURE == 'ppc':
MAC_MIN_VERS = '10.4'
MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
+ CC = 'gcc-4.0'
+ CXX = 'g++-4.0'
+else :
+ MAC_MIN_VERS = '10.5'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
+ CC = 'gcc-4.2'
+ CXX = 'g++-4.2'
+#############################################################################
+################### Dependency settings ##################
+#############################################################################
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
-FFMPEG_PRECOMPILED = False
+FFMPEG_PRECOMPILED = True
if FFMPEG_PRECOMPILED:
# use precompiled ffmpeg in /lib
BF_FFMPEG = LIBDIR + '/ffmpeg'
@@ -45,8 +74,8 @@
BF_FFMPEG_INC = '${BF_FFMPEG}'
if USE_SDK==True:
BF_FFMPEG_EXTRA = '-isysroot '+MACOSX_SDK+' -mmacosx-version-min='+MAC_MIN_VERS
- BF_XVIDCORE_CONFIG = '--disable-assembly' # currently causes errors, even with yasm installed
- BF_X264_CONFIG = '--disable-pthread'
+ BF_XVIDCORE_CONFIG = '--disable-assembly --disable-mmx' # currently causes errors, even with yasm installed
+ BF_X264_CONFIG = '--disable-pthread --disable-asm'
if BF_PYTHON_VERSION=='3.1':
# python 3.1 uses precompiled libraries in bf svn /lib by default
@@ -75,10 +104,11 @@
BF_PYTHON_LINKFLAGS = ['-u','_PyMac_Error','-framework','System','-framework','Python']
if MAC_CUR_VER=='10.3' or MAC_CUR_VER=='10.4':
BF_PYTHON_LINKFLAGS = ['-u', '__dummy']+BF_PYTHON_LINKFLAGS
+
-BF_QUIET = '1'
-WITH_BF_OPENMP = '0'
+WITH_BF_OPENMP = '0' # multithreading for fluids, cloth and smoke ( only works with ICC atm )
+WITH_BF_OPENAL = True
#different lib must be used following version of gcc
# for gcc 3.3
#BF_OPENAL = LIBDIR + '/openal'
@@ -89,11 +119,11 @@
BF_OPENAL = LIBDIR + '/openal'
WITH_BF_STATICOPENAL = False
-BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'openal'
-BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+BF_OPENAL_INC = '${BF_OPENAL}/include' # only headers from libdir needed for proper use of framework !!!!
+#BF_OPENAL_LIB = 'openal'
+#BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
# Warning, this static lib configuration is untested! users of this OS please confirm.
-BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+#BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
# Warning, this static lib configuration is untested! users of this OS please confirm.
BF_CXX = '/usr'
@@ -199,10 +229,13 @@
BF_FREETYPE_LIB = 'freetype'
BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
-WITH_BF_QUICKTIME = True # -DWITH_QUICKTIME
+if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
+ WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME ( disable for 64bit atm )
+else:
+ WITH_BF_QUICKTIME = True
WITH_BF_ICONV = True
-BF_ICONV = LIBDIR + "/iconv"
+BF_ICONV = '/usr'
BF_ICONV_INC = '${BF_ICONV}/include'
BF_ICONV_LIB = 'iconv'
#BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
@@ -213,13 +246,31 @@
BF_OPENGL_LIBPATH = '/System/Library/Frameworks/OpenGL.framework/Libraries'
BF_OPENGL_LINKFLAGS = ['-framework', 'OpenGL']
-CFLAGS = ['-pipe','-fPIC','-funsigned-char']
+#############################################################################
+################### various compile settings and flags ##################
+#############################################################################
-CPPFLAGS = ['-fpascal-strings']
-CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fpascal-strings']
-CXXFLAGS = [ '-pipe','-fPIC','-funsigned-char', '-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']
+BF_QUIET = '1' # suppress verbose output
+if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
+ ARCH_FLAGS = ['-m64']
+else:
+ ARCH_FLAGS = ['-m32']
+
+CFLAGS = ['-pipe','-funsigned-char']+ARCH_FLAGS
+
+CPPFLAGS = ['-fpascal-strings']+ARCH_FLAGS
+CCFLAGS = ['-pipe','-funsigned-char','-fpascal-strings']+ARCH_FLAGS
+CXXFLAGS = ['-pipe','-funsigned-char', '-fpascal-strings']+ARCH_FLAGS
+
+if WITH_GHOST_COCOA==True:
+ PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Cocoa','-framework','Carbon','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
+else:
+ PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Carbon','-framework','AGL','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
+
+if WITH_BF_QUICKTIME == True:
+ PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-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']
@@ -232,33 +283,34 @@
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
+ PLATFORM_LINKFLAGS = ['-mmacosx-version-min='+MAC_MIN_VERS,'-Wl','-syslibroot '+MACOSX_SDK]+PLATFORM_LINKFLAGS
CCFLAGS=SDK_FLAGS+CCFLAGS
CXXFLAGS=SDK_FLAGS+CXXFLAGS
-# you can add -mssse3 if gcc >= 4.2
-if MAC_PROC == 'i386':
+if MACOSX_ARCHITECTURE == 'i386' or MACOSX_ARCHITECTURE == 'x86_64':
REL_CFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3']
REL_CCFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3']
else:
CFLAGS = CFLAGS+['-fno-strict-aliasing']
CCFLAGS = CCFLAGS+['-fno-strict-aliasing']
CXXFLAGS = CXXFLAGS+['-fno-strict-aliasing']
-
REL_CFLAGS = ['-O2']
REL_CCFLAGS = ['-O2']
+# add -mssse3 for intel 64bit archs
+if MACOSX_ARCHITECTURE == 'x86_64':
+ REL_CFLAGS = REL_CFLAGS+['-mssse3']
+ REL_CCFLAGS = REL_CCFLAGS+['-mssse3']
+
##BF_DEPEND = True
##
##AR = ar
##ARFLAGS = ruv
##ARFLAGSQUIET = ru
##
-CC = 'gcc'
-CXX = 'g++'
-C_WARN = ['-Wdeclaration-after-statement']
+#C_WARN = ['-Wdeclaration-after-statement']
-CC_WARN = ['-Wall', '-Wno-long-double']
+CC_WARN = ['-Wall']
##FIX_STUBS_WARNINGS = -Wno-unused
@@ -272,5 +324,9 @@
BF_DEBUG = False
BF_DEBUG_CCFLAGS = ['-g']
+#############################################################################
+################### Output directories ##################
+#############################################################################
+
BF_BUILDDIR='../build/darwin'
BF_INSTALLDIR='../install/darwin'
Modified: branches/sculpt25/intern/ghost/SConscript
===================================================================
--- branches/sculpt25/intern/ghost/SConscript 2009-10-29 10:03:34 UTC (rev 24152)
+++ branches/sculpt25/intern/ghost/SConscript 2009-10-29 10:12:07 UTC (rev 24153)
@@ -7,26 +7,47 @@
window_system = env['OURPLATFORM']
sources = env.Glob('intern/*.cpp')
+if window_system == 'darwin':
+ sources += env.Glob('intern/*.mm')
+if env['WITH_GHOST_COCOA'] == True:
+ env.Append(CFLAGS=['-DGHOST_COCOA'])
+ env.Append(CXXFLAGS=['-DGHOST_COCOA'])
+ env.Append(CPPFLAGS=['-DGHOST_COCOA'])
+
+#defs = ''
+#if env['WITH_GHOST_COCOA']:
+# defs += 'GHOST_COCOA'
+# maybe we need it later
+
pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_Window']
if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd6', 'irix6'):
- for f in pf:
- sources.remove('intern' + os.sep + f + 'Win32.cpp')
- sources.remove('intern' + os.sep + f + 'Carbon.cpp')
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list