[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30174] branches/soc-2010-nicolasbishop: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29912 :30167
Nicholas Bishop
nicholasbishop at gmail.com
Sat Jul 10 08:03:29 CEST 2010
Revision: 30174
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30174
Author: nicholasbishop
Date: 2010-07-10 08:03:27 +0200 (Sat, 10 Jul 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29912:30167
Modified Paths:
--------------
branches/soc-2010-nicolasbishop/CMake/macros.cmake
branches/soc-2010-nicolasbishop/CMakeLists.txt
branches/soc-2010-nicolasbishop/SConstruct
branches/soc-2010-nicolasbishop/config/darwin-config.py
branches/soc-2010-nicolasbishop/config/linux2-config.py
branches/soc-2010-nicolasbishop/extern/glew/include/GL/glew.h
branches/soc-2010-nicolasbishop/extern/glew/src/glew.c
branches/soc-2010-nicolasbishop/intern/ghost/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/ghost/GHOST_C-api.h
branches/soc-2010-nicolasbishop/intern/ghost/GHOST_ISystem.h
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_System.h
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemCarbon.h
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemWin32.h
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2010-nicolasbishop/intern/ghost/intern/Makefile
branches/soc-2010-nicolasbishop/release/scripts/modules/blend_render_info.py
branches/soc-2010-nicolasbishop/release/scripts/op/wm.py
branches/soc-2010-nicolasbishop/release/scripts/presets/cloth/cotton.py
branches/soc-2010-nicolasbishop/release/scripts/presets/cloth/denim.py
branches/soc-2010-nicolasbishop/release/scripts/presets/cloth/leather.py
branches/soc-2010-nicolasbishop/release/scripts/presets/cloth/rubber.py
branches/soc-2010-nicolasbishop/release/scripts/presets/cloth/silk.py
branches/soc-2010-nicolasbishop/release/scripts/presets/ffmpeg/DV.py
branches/soc-2010-nicolasbishop/release/scripts/presets/ffmpeg/DVD.py
branches/soc-2010-nicolasbishop/release/scripts/presets/ffmpeg/SVCD.py
branches/soc-2010-nicolasbishop/release/scripts/presets/ffmpeg/VCD.py
branches/soc-2010-nicolasbishop/release/scripts/presets/ffmpeg/h264.py
branches/soc-2010-nicolasbishop/release/scripts/presets/ffmpeg/theora.py
branches/soc-2010-nicolasbishop/release/scripts/presets/ffmpeg/xvid.py
branches/soc-2010-nicolasbishop/release/scripts/presets/render/DVCPRO_HD_1080p.py
branches/soc-2010-nicolasbishop/release/scripts/presets/render/DVCPRO_HD_720p.py
branches/soc-2010-nicolasbishop/release/scripts/presets/render/HDTV_1080p.py
branches/soc-2010-nicolasbishop/release/scripts/presets/render/HDTV_720p.py
branches/soc-2010-nicolasbishop/release/scripts/presets/render/HDV_1080p.py
branches/soc-2010-nicolasbishop/release/scripts/presets/render/TV_NTSC_16_colon_9.py
branches/soc-2010-nicolasbishop/release/scripts/presets/render/TV_NTSC_4_colon_3.py
branches/soc-2010-nicolasbishop/release/scripts/presets/render/TV_PAL_16_colon_9.py
branches/soc-2010-nicolasbishop/release/scripts/presets/render/TV_PAL_4_colon_3.py
branches/soc-2010-nicolasbishop/release/scripts/presets/sss/apple.py
branches/soc-2010-nicolasbishop/release/scripts/presets/sss/chicken.py
branches/soc-2010-nicolasbishop/release/scripts/presets/sss/cream.py
branches/soc-2010-nicolasbishop/release/scripts/presets/sss/ketchup.py
branches/soc-2010-nicolasbishop/release/scripts/presets/sss/marble.py
branches/soc-2010-nicolasbishop/release/scripts/presets/sss/potato.py
branches/soc-2010-nicolasbishop/release/scripts/presets/sss/skim_milk.py
branches/soc-2010-nicolasbishop/release/scripts/presets/sss/skin1.py
branches/soc-2010-nicolasbishop/release/scripts/presets/sss/skin2.py
branches/soc-2010-nicolasbishop/release/scripts/presets/sss/whole_milk.py
branches/soc-2010-nicolasbishop/release/scripts/presets/sunsky/classic.py
branches/soc-2010-nicolasbishop/release/scripts/presets/sunsky/desert.py
branches/soc-2010-nicolasbishop/release/scripts/presets/sunsky/mountain.py
branches/soc-2010-nicolasbishop/release/scripts/templates/operator.py
branches/soc-2010-nicolasbishop/release/scripts/templates/operator_modal.py
branches/soc-2010-nicolasbishop/release/scripts/templates/operator_modal_draw.py
branches/soc-2010-nicolasbishop/release/scripts/templates/operator_modal_view3d.py
branches/soc-2010-nicolasbishop/release/scripts/templates/operator_uv.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_curve.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_object_constraint.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_common.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_softbody.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_texture.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_info.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_logic.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_sequencer.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_time.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-nicolasbishop/source/Makefile
branches/soc-2010-nicolasbishop/source/blender/blenfont/intern/blf_lang.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_mball.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_multires.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_node.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_sca.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_scene.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/SConscript
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/blender.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/exotic.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/group.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/image.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/ipo.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/library.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/mball.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/multires.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/object.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/particle_system.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/sca.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/scene.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/texture.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_path_util.h
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/BLI_bfile.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/path_util.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readfile.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/writefile.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_deps.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_filter.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/keyframes_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/keyingsets.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/meshlaplacian.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/meshlaplacian.h
branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_anim_api.h
branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_armature.h
branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_render.h
branches/soc-2010-nicolasbishop/source/blender/editors/include/UI_interface.h
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_icons.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_layout.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_templates.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_widgets.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/mesh_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/mesh_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/meshtools.c
branches/soc-2010-nicolasbishop/source/blender/editors/metaball/mball_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_add.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_constraint.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_modifier.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_relations.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_vgroup.c
branches/soc-2010-nicolasbishop/source/blender/editors/render/render_internal.c
branches/soc-2010-nicolasbishop/source/blender/editors/render/render_preview.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/area.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/screen_context.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/file_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/filelist.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/fsmenu.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/fsmenu.h
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/space_file.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/space_info/space_info.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/logic_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/drawnode.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_generics.c
branches/soc-2010-nicolasbishop/source/blender/editors/util/ed_util.c
branches/soc-2010-nicolasbishop/source/blender/gpu/GPU_extensions.h
branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_action_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_node_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_object_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_texture_types.h
branches/soc-2010-nicolasbishop/source/blender/makesrna/SConscript
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_access.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_action.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_texture.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2010-nicolasbishop/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
branches/soc-2010-nicolasbishop/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
branches/soc-2010-nicolasbishop/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_interface.c
branches/soc-2010-nicolasbishop/source/blender/readblenfile/intern/BLO_readblenfile.c
branches/soc-2010-nicolasbishop/source/blender/render/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2010-nicolasbishop/source/blender/render/intern/include/texture.h
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/convertblender.c
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/pipeline.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/WM_api.h
branches/soc-2010-nicolasbishop/source/blender/windowmanager/WM_types.h
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/wm_files.h
branches/soc-2010-nicolasbishop/source/creator/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/creator/creator.c
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/netscape/common/npmac.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Rasterizer/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
branches/soc-2010-nicolasbishop/source/nan_compile.mk
branches/soc-2010-nicolasbishop/tools/Blender.py
branches/soc-2010-nicolasbishop/tools/btools.py
Added Paths:
-----------
branches/soc-2010-nicolasbishop/intern/ghost/GHOST_Path-api.h
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_Path-api.cpp
branches/soc-2010-nicolasbishop/release/windows/installer/
branches/soc-2010-nicolasbishop/release/windows/installer/00.checked.bmp
branches/soc-2010-nicolasbishop/release/windows/installer/00.header.bmp
branches/soc-2010-nicolasbishop/release/windows/installer/00.installer.ico
branches/soc-2010-nicolasbishop/release/windows/installer/00.sconsblender.nsi
Removed Paths:
-------------
branches/soc-2010-nicolasbishop/release/windows/inno/
branches/soc-2010-nicolasbishop/release/windows/installer/00.checked.bmp
branches/soc-2010-nicolasbishop/release/windows/installer/00.header.bmp
branches/soc-2010-nicolasbishop/release/windows/installer/00.installer.ico
branches/soc-2010-nicolasbishop/release/windows/installer/00.sconsblender.nsi
Modified: branches/soc-2010-nicolasbishop/CMake/macros.cmake
===================================================================
--- branches/soc-2010-nicolasbishop/CMake/macros.cmake 2010-07-10 04:48:38 UTC (rev 30173)
+++ branches/soc-2010-nicolasbishop/CMake/macros.cmake 2010-07-10 06:03:27 UTC (rev 30174)
@@ -181,3 +181,20 @@
TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
ENDIF(WIN32)
ENDMACRO(SETUP_LIBLINKS)
+
+MACRO(TEST_SSE_SUPPORT)
+ INCLUDE(CheckCXXSourceCompiles)
+
+ MESSAGE(STATUS "Detecting SSE support")
+ IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+ SET(CMAKE_REQUIRED_FLAGS "-msse -msse2")
+ ELSEIF(MSVC)
+ SET(CMAKE_REQUIRED_FLAGS "/arch:SSE2")
+ ENDIF()
+
+ CHECK_CXX_SOURCE_COMPILES("
+ #include <xmmintrin.h>
+ int main() { __m128 v = _mm_setzero_ps(); return 0; }"
+ SUPPORT_SSE_BUILD)
+ENDMACRO(TEST_SSE_SUPPORT)
+
Modified: branches/soc-2010-nicolasbishop/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicolasbishop/CMakeLists.txt 2010-07-10 04:48:38 UTC (rev 30173)
+++ branches/soc-2010-nicolasbishop/CMakeLists.txt 2010-07-10 06:03:27 UTC (rev 30174)
@@ -60,6 +60,10 @@
SET(BLENDER_VERSION 2.5)
#-----------------------------------------------------------------------------
+# Load some macros.
+INCLUDE(CMake/macros.cmake)
+
+#-----------------------------------------------------------------------------
# Set default config options
# Blender internal features
@@ -114,7 +118,7 @@
OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
-IF (APPLE)
+IF(APPLE)
OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
OPTION(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
OPTION(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
@@ -128,6 +132,8 @@
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
+TEST_SSE_SUPPORT()
+
# disabled for now, not supported
# OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
@@ -140,10 +146,6 @@
# When changing any of this remember to update the notes in doc/blender-cmake.txt
#-----------------------------------------------------------------------------
-# Load some macros.
-INCLUDE(CMake/macros.cmake)
-
-#-----------------------------------------------------------------------------
#Platform specifics
IF(UNIX AND NOT APPLE)
@@ -259,6 +261,7 @@
SET(FFMPEG_INC ${FFMPEG}/include)
SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
ENDIF(WITH_FFMPEG)
IF(WITH_FFTW3)
@@ -308,9 +311,11 @@
SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -Wno-char-subscripts")
- IF(WITH_RAYOPTIMIZATION)
- SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}")
- ENDIF(WITH_RAYOPTIMIZATION)
+ IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
+ SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}")
+ ADD_DEFINITIONS(-D__SSE__)
+ ADD_DEFINITIONS(-D__MMX__)
+ ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
SET(PLATFORM_LINKFLAGS "-pthread")
@@ -396,6 +401,11 @@
SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
ENDIF(WITH_QUICKTIME)
+ IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
+ ADD_DEFINITIONS(-D__SSE__)
+ ADD_DEFINITIONS(-D__MMX__)
+ ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
+
IF(MSVC)
IF(CMAKE_CL_64)
SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
@@ -727,6 +737,7 @@
SET(FFMPEG_INC ${FFMPEG}/include)
SET(FFMPEG_LIB avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
ENDIF(WITH_FFMPEG)
SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
@@ -797,6 +808,12 @@
SET(TIFF_LIBPATH ${TIFF}/lib)
ENDIF(WITH_TIFF)
+ IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
+ SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}")
+ ADD_DEFINITIONS(-D__SSE__)
+ ADD_DEFINITIONS(-D__MMX__)
+ ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
+
SET(EXETYPE MACOSX_BUNDLE)
SET(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")
Modified: branches/soc-2010-nicolasbishop/SConstruct
===================================================================
--- branches/soc-2010-nicolasbishop/SConstruct 2010-07-10 04:48:38 UTC (rev 30173)
+++ branches/soc-2010-nicolasbishop/SConstruct 2010-07-10 06:03:27 UTC (rev 30174)
@@ -56,6 +56,8 @@
btools = tools.btools
B = tools.Blender
+VERSION = tools.btools.VERSION # This is used in creating the local config directories
+
### globals ###
platform = sys.platform
quickie = None
@@ -193,7 +195,7 @@
# NOTE: only do the scripts directory for now, otherwise is too disruptive for developers
# TODO: perhaps we need an option (off by default) to not do this altogether...
if not env['WITHOUT_BF_INSTALL'] and not env['WITHOUT_BF_OVERWRITE_INSTALL']:
- scriptsDir = env['BF_INSTALLDIR'] + os.sep + '.blender' + os.sep + 'scripts'
+ scriptsDir = os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts')
if os.path.isdir(scriptsDir):
print B.bc.OKGREEN + "Clearing installation directory%s: %s" % (B.bc.ENDC, os.path.abspath(scriptsDir))
shutil.rmtree(scriptsDir)
@@ -434,9 +436,11 @@
blenderinstall = env.Install(dir=dir, source=B.program_list)
-#-- .blender
-#- dont do .blender and scripts for darwin, it is already in the bundle
+#-- local path = config files in install dir: installdir\VERSION
+#- dont do config and scripts for darwin, it is already in the bundle
dotblendlist = []
+datafileslist = []
+datafilestargetlist = []
dottargetlist = []
scriptinstall = []
@@ -455,20 +459,29 @@
if f.endswith('.ttf'):
continue
- dotblendlist.append(os.path.join(dp, f))
- if env['WITH_BF_FHS']: dir= os.path.join(*([BLENDERPATH] + dp.split(os.sep)[2:])) # skip bin/.blender
- else: dir= os.path.join(*([BLENDERPATH] + dp.split(os.sep)[1:])) # skip bin
-
- dottargetlist.append(dir + os.sep + f)
+ if 'locale' in dp:
+ datafileslist.append(os.path.join(dp,f))
+ if env['WITH_BF_FHS']: dir= os.path.join(*([BLENDERPATH] + ['datafiles'] + dp.split(os.sep)[2:])) # skip bin/.blender
+ else: dir= os.path.join(*([BLENDERPATH] + [VERSION] + ['datafiles'] + dp.split(os.sep)[1:])) # skip bin
+ datafilestargetlist.append(dir + os.sep + f)
+
+ else:
+ dotblendlist.append(os.path.join(dp, f))
+ if env['WITH_BF_FHS']: dir= os.path.join(*([BLENDERPATH] + ['config'] + dp.split(os.sep)[2:])) # skip bin/.blender
+ else: dir= os.path.join(*([BLENDERPATH] + [VERSION] + ['config'] + dp.split(os.sep)[1:])) # skip bin
-
+ dottargetlist.append(dir + 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))
+ for targetdir,srcfile in zip(datafilestargetlist, datafileslist):
+ td, tf = os.path.split(targetdir)
+ dotblenderinstall.append(env.Install(dir=td, source=srcfile))
if env['WITH_BF_PYTHON']:
- #-- .blender/scripts
+ #-- local/VERSION/scripts
scriptpaths=['release/scripts']
for scriptpath in scriptpaths:
for dp, dn, df in os.walk(scriptpath):
@@ -476,7 +489,7 @@
dn.remove('.svn')
if env['WITH_BF_FHS']: dir = BLENDERPATH
- else: dir = os.path.join(env['BF_INSTALLDIR'], '.blender')
+ else: dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
source=[os.path.join(dp, f) for f in df if f[-3:]!='pyc']
Modified: branches/soc-2010-nicolasbishop/config/darwin-config.py
===================================================================
--- branches/soc-2010-nicolasbishop/config/darwin-config.py 2010-07-10 04:48:38 UTC (rev 30173)
+++ branches/soc-2010-nicolasbishop/config/darwin-config.py 2010-07-10 06:03:27 UTC (rev 30174)
@@ -279,9 +279,9 @@
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
+CPPFLAGS = []+ARCH_FLAGS
+CCFLAGS = ['-pipe','-funsigned-char']+ARCH_FLAGS
+CXXFLAGS = ['-pipe','-funsigned-char']+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
Modified: branches/soc-2010-nicolasbishop/config/linux2-config.py
===================================================================
--- branches/soc-2010-nicolasbishop/config/linux2-config.py 2010-07-10 04:48:38 UTC (rev 30173)
+++ branches/soc-2010-nicolasbishop/config/linux2-config.py 2010-07-10 06:03:27 UTC (rev 30174)
@@ -181,6 +181,9 @@
CPPFLAGS = []
CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']
+if WITH_BF_FFMPEG:
+ # libavutil needs UINT64_C()
+ CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ]
REL_CFLAGS = ['-O2']
REL_CCFLAGS = ['-O2']
##BF_DEPEND = True
Modified: branches/soc-2010-nicolasbishop/extern/glew/include/GL/glew.h
===================================================================
--- branches/soc-2010-nicolasbishop/extern/glew/include/GL/glew.h 2010-07-10 04:48:38 UTC (rev 30173)
+++ branches/soc-2010-nicolasbishop/extern/glew/include/GL/glew.h 2010-07-10 06:03:27 UTC (rev 30174)
@@ -2702,7 +2702,7 @@
typedef void (GLAPIENTRY * PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint* framebuffers);
typedef void (GLAPIENTRY * PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint* renderbuffers);
typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list