[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13514] branches/soc-2007-joeedh: Merge with trunk at revision 13491
Joseph Eagar
joeedh at gmail.com
Fri Feb 1 19:27:29 CET 2008
Revision: 13514
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13514
Author: joeedh
Date: 2008-02-01 19:27:28 +0100 (Fri, 01 Feb 2008)
Log Message:
-----------
Merge with trunk at revision 13491
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13491
Modified Paths:
--------------
branches/soc-2007-joeedh/CMakeLists.txt
branches/soc-2007-joeedh/SConstruct
branches/soc-2007-joeedh/config/linux2-config.py
branches/soc-2007-joeedh/config/win32-vc-config.py
branches/soc-2007-joeedh/extern/CMakeLists.txt
branches/soc-2007-joeedh/extern/Makefile
branches/soc-2007-joeedh/extern/SConscript
branches/soc-2007-joeedh/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/CMakeLists.txt
branches/soc-2007-joeedh/extern/bullet2/src/SConscript
branches/soc-2007-joeedh/intern/bmfont/BMF_Api.h
branches/soc-2007-joeedh/intern/bmfont/intern/BMF_Api.cpp
branches/soc-2007-joeedh/intern/bmfont/intern/BMF_BitmapFont.cpp
branches/soc-2007-joeedh/intern/bmfont/intern/BMF_BitmapFont.h
branches/soc-2007-joeedh/intern/elbeem/CMakeLists.txt
branches/soc-2007-joeedh/intern/elbeem/SConscript
branches/soc-2007-joeedh/intern/elbeem/intern/isosurface.cpp
branches/soc-2007-joeedh/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/blender/render/BRE_render.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/blender/src/BL_src.vcproj
branches/soc-2007-joeedh/release/Makefile
branches/soc-2007-joeedh/release/scripts/add_mesh_torus.py
branches/soc-2007-joeedh/release/scripts/export_m3g.py
branches/soc-2007-joeedh/release/scripts/import_dxf.py
branches/soc-2007-joeedh/release/scripts/lightwave_import.py
branches/soc-2007-joeedh/release/scripts/object_drop.py
branches/soc-2007-joeedh/release/scripts/wizard_curve2tree.py
branches/soc-2007-joeedh/release/scripts/x3d_export.py
branches/soc-2007-joeedh/source/Makefile
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_action.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_anim.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_armature.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_blender.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_group.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_image.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_mesh.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_modifier.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_node.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_object.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_particle.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_sculpt.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2007-joeedh/source/blender/blenkernel/CMakeLists.txt
branches/soc-2007-joeedh/source/blender/blenkernel/SConscript
branches/soc-2007-joeedh/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/Makefile
branches/soc-2007-joeedh/source/blender/blenkernel/intern/action.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/anim.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/armature.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/blender.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/constraint.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/effect.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/group.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/image.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/mesh.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/modifier.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/node.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/object.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/particle.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/particle_system.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/scene.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/world.c
branches/soc-2007-joeedh/source/blender/blenlib/BLI_blenlib.h
branches/soc-2007-joeedh/source/blender/blenlib/CMakeLists.txt
branches/soc-2007-joeedh/source/blender/blenlib/SConscript
branches/soc-2007-joeedh/source/blender/blenlib/intern/Makefile
branches/soc-2007-joeedh/source/blender/blenlib/intern/bpath.c
branches/soc-2007-joeedh/source/blender/blenlib/intern/fileops.c
branches/soc-2007-joeedh/source/blender/blenlib/intern/storage.c
branches/soc-2007-joeedh/source/blender/blenlib/intern/util.c
branches/soc-2007-joeedh/source/blender/blenloader/intern/readfile.c
branches/soc-2007-joeedh/source/blender/blenloader/intern/readfile.h
branches/soc-2007-joeedh/source/blender/blenloader/intern/writefile.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/anim.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/soc-2007-joeedh/source/blender/imbuf/intern/imageprocess.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2007-joeedh/source/blender/imbuf/intern/scaling.c
branches/soc-2007-joeedh/source/blender/include/BDR_drawaction.h
branches/soc-2007-joeedh/source/blender/include/BDR_editobject.h
branches/soc-2007-joeedh/source/blender/include/BDR_sculptmode.h
branches/soc-2007-joeedh/source/blender/include/BIF_editaction.h
branches/soc-2007-joeedh/source/blender/include/BIF_editarmature.h
branches/soc-2007-joeedh/source/blender/include/BIF_editdeform.h
branches/soc-2007-joeedh/source/blender/include/BIF_editparticle.h
branches/soc-2007-joeedh/source/blender/include/BIF_editseq.h
branches/soc-2007-joeedh/source/blender/include/BIF_editsima.h
branches/soc-2007-joeedh/source/blender/include/BIF_editview.h
branches/soc-2007-joeedh/source/blender/include/BIF_outliner.h
branches/soc-2007-joeedh/source/blender/include/BIF_poseobject.h
branches/soc-2007-joeedh/source/blender/include/BIF_transform.h
branches/soc-2007-joeedh/source/blender/include/BSE_drawipo.h
branches/soc-2007-joeedh/source/blender/include/BSE_editaction_types.h
branches/soc-2007-joeedh/source/blender/include/BSE_editipo.h
branches/soc-2007-joeedh/source/blender/include/BSE_node.h
branches/soc-2007-joeedh/source/blender/include/butspace.h
branches/soc-2007-joeedh/source/blender/include/transform.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_action_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_armature_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_color_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_material_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_node_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_object_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_particle_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_scene_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_space_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_world_types.h
branches/soc-2007-joeedh/source/blender/makesdna/intern/makesdna.c
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_bilateralblur.c
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_idMask.c
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c
branches/soc-2007-joeedh/source/blender/python/BPY_interface.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Effect.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Group.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/IDProp.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Mathutils.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Ipo.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/LibData.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Render.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Scene.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/quat.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/sceneRender.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/sceneRender.h
branches/soc-2007-joeedh/source/blender/radiosity/intern/source/radrender.c
branches/soc-2007-joeedh/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2007-joeedh/source/blender/render/extern/include/RE_raytrace.h
branches/soc-2007-joeedh/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2007-joeedh/source/blender/render/intern/include/rendercore.h
branches/soc-2007-joeedh/source/blender/render/intern/include/renderdatabase.h
branches/soc-2007-joeedh/source/blender/render/intern/include/shading.h
branches/soc-2007-joeedh/source/blender/render/intern/include/strand.h
branches/soc-2007-joeedh/source/blender/render/intern/source/convertblender.c
branches/soc-2007-joeedh/source/blender/render/intern/source/envmap.c
branches/soc-2007-joeedh/source/blender/render/intern/source/pipeline.c
branches/soc-2007-joeedh/source/blender/render/intern/source/pixelblending.c
branches/soc-2007-joeedh/source/blender/render/intern/source/pixelshading.c
branches/soc-2007-joeedh/source/blender/render/intern/source/rayshade.c
branches/soc-2007-joeedh/source/blender/render/intern/source/raytrace.c
branches/soc-2007-joeedh/source/blender/render/intern/source/renderdatabase.c
branches/soc-2007-joeedh/source/blender/render/intern/source/shadeinput.c
branches/soc-2007-joeedh/source/blender/render/intern/source/sss.c
branches/soc-2007-joeedh/source/blender/render/intern/source/texture.c
branches/soc-2007-joeedh/source/blender/src/buttons_editing.c
branches/soc-2007-joeedh/source/blender/src/buttons_object.c
branches/soc-2007-joeedh/source/blender/src/buttons_scene.c
branches/soc-2007-joeedh/source/blender/src/buttons_shading.c
branches/soc-2007-joeedh/source/blender/src/drawaction.c
branches/soc-2007-joeedh/source/blender/src/drawarmature.c
branches/soc-2007-joeedh/source/blender/src/drawipo.c
branches/soc-2007-joeedh/source/blender/src/drawnode.c
branches/soc-2007-joeedh/source/blender/src/drawobject.c
branches/soc-2007-joeedh/source/blender/src/drawseq.c
branches/soc-2007-joeedh/source/blender/src/drawtime.c
branches/soc-2007-joeedh/source/blender/src/drawview.c
branches/soc-2007-joeedh/source/blender/src/edit.c
branches/soc-2007-joeedh/source/blender/src/editaction.c
branches/soc-2007-joeedh/source/blender/src/editarmature.c
branches/soc-2007-joeedh/source/blender/src/editconstraint.c
branches/soc-2007-joeedh/source/blender/src/editdeform.c
branches/soc-2007-joeedh/source/blender/src/editgroup.c
branches/soc-2007-joeedh/source/blender/src/editimasel.c
branches/soc-2007-joeedh/source/blender/src/editipo.c
branches/soc-2007-joeedh/source/blender/src/editmesh.c
branches/soc-2007-joeedh/source/blender/src/editmesh_tools.c
branches/soc-2007-joeedh/source/blender/src/editnla.c
branches/soc-2007-joeedh/source/blender/src/editnode.c
branches/soc-2007-joeedh/source/blender/src/editobject.c
branches/soc-2007-joeedh/source/blender/src/editparticle.c
branches/soc-2007-joeedh/source/blender/src/editseq.c
branches/soc-2007-joeedh/source/blender/src/editsima.c
branches/soc-2007-joeedh/source/blender/src/editview.c
branches/soc-2007-joeedh/source/blender/src/filesel.c
branches/soc-2007-joeedh/source/blender/src/header_action.c
branches/soc-2007-joeedh/source/blender/src/header_filesel.c
branches/soc-2007-joeedh/source/blender/src/header_image.c
branches/soc-2007-joeedh/source/blender/src/header_imasel.c
branches/soc-2007-joeedh/source/blender/src/header_view3d.c
branches/soc-2007-joeedh/source/blender/src/interface_draw.c
branches/soc-2007-joeedh/source/blender/src/meshlaplacian.c
branches/soc-2007-joeedh/source/blender/src/outliner.c
branches/soc-2007-joeedh/source/blender/src/poselib.c
branches/soc-2007-joeedh/source/blender/src/poseobject.c
branches/soc-2007-joeedh/source/blender/src/previewrender.c
branches/soc-2007-joeedh/source/blender/src/renderwin.c
branches/soc-2007-joeedh/source/blender/src/resources.c
branches/soc-2007-joeedh/source/blender/src/sculptmode-stroke.c
branches/soc-2007-joeedh/source/blender/src/sculptmode.c
branches/soc-2007-joeedh/source/blender/src/sequence.c
branches/soc-2007-joeedh/source/blender/src/space.c
branches/soc-2007-joeedh/source/blender/src/toolbox.c
branches/soc-2007-joeedh/source/blender/src/transform.c
branches/soc-2007-joeedh/source/blender/src/transform_conversions.c
branches/soc-2007-joeedh/source/blender/src/transform_generics.c
branches/soc-2007-joeedh/source/blender/src/transform_snap.c
branches/soc-2007-joeedh/source/blender/src/usiblender.c
branches/soc-2007-joeedh/source/blender/src/view.c
branches/soc-2007-joeedh/source/blender/src/vpaint.c
branches/soc-2007-joeedh/source/blender/yafray/intern/export_File.cpp
branches/soc-2007-joeedh/source/blender/yafray/intern/export_File.h
branches/soc-2007-joeedh/source/blender/yafray/intern/export_Plugin.cpp
branches/soc-2007-joeedh/source/blender/yafray/intern/export_Plugin.h
branches/soc-2007-joeedh/source/blender/yafray/intern/yafray_Render.cpp
branches/soc-2007-joeedh/source/blender/yafray/intern/yafray_Render.h
branches/soc-2007-joeedh/source/creator/CMakeLists.txt
branches/soc-2007-joeedh/source/creator/Makefile
branches/soc-2007-joeedh/source/creator/SConscript
branches/soc-2007-joeedh/source/creator/creator.c
branches/soc-2007-joeedh/source/nan_definitions.mk
branches/soc-2007-joeedh/tools/Blender.py
branches/soc-2007-joeedh/tools/btools.py
Added Paths:
-----------
branches/soc-2007-joeedh/extern/binreloc/
branches/soc-2007-joeedh/extern/binreloc/CMakeLists.txt
branches/soc-2007-joeedh/extern/binreloc/Makefile
branches/soc-2007-joeedh/extern/binreloc/SConscript
branches/soc-2007-joeedh/extern/binreloc/binreloc.c
branches/soc-2007-joeedh/extern/binreloc/include/
branches/soc-2007-joeedh/extern/binreloc/include/binreloc.h
branches/soc-2007-joeedh/extern/bullet2/src/Bullet-C-Api.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
branches/soc-2007-joeedh/release/getversion.py
branches/soc-2007-joeedh/release/scripts/bpymodules/blend2renderinfo.py
branches/soc-2007-joeedh/release/scripts/object_timeofs_follow_act.py
branches/soc-2007-joeedh/release/scripts/render_save_layers.py
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_cloth.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_collision.h
branches/soc-2007-joeedh/source/blender/blenkernel/intern/cloth.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/collision.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/implicit.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/kdop.c
branches/soc-2007-joeedh/source/blender/include/BIF_radialcontrol.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_cloth_types.h
branches/soc-2007-joeedh/source/blender/render/intern/include/occlusion.h
branches/soc-2007-joeedh/source/blender/render/intern/source/occlusion.c
branches/soc-2007-joeedh/source/blender/src/radialcontrol.c
Removed Paths:
-------------
branches/soc-2007-joeedh/extern/binreloc/CMakeLists.txt
branches/soc-2007-joeedh/extern/binreloc/Makefile
branches/soc-2007-joeedh/extern/binreloc/SConscript
branches/soc-2007-joeedh/extern/binreloc/binreloc.c
branches/soc-2007-joeedh/extern/binreloc/include/
branches/soc-2007-joeedh/extern/binreloc/include/binreloc.h
Modified: branches/soc-2007-joeedh/CMakeLists.txt
===================================================================
--- branches/soc-2007-joeedh/CMakeLists.txt 2008-02-01 12:47:20 UTC (rev 13513)
+++ branches/soc-2007-joeedh/CMakeLists.txt 2008-02-01 18:27:28 UTC (rev 13514)
@@ -65,8 +65,9 @@
OPTION(WITH_QUICKTIME "Enable Quicktime Support" OFF)
OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" OFF)
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)
+OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
+OPTION(YESIAMSTUPID "Enable execution on 64-bit platforms" OFF)
+OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -184,6 +185,13 @@
SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++")
+ IF(WITH_OPENMP)
+ SET(LLIBS "${LLIBS} -lgomp ")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
+ ENDIF(WITH_OPENMP)
+
+
SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DXP_UNIX -Wno-char-subscripts")
SET(PLATFORM_LINKFLAGS "-pthread")
@@ -270,6 +278,11 @@
SET(CMAKE_C_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ IF(WITH_OPENMP)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp ")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
+ ENDIF(WITH_OPENMP)
+
SET(SDL ${LIBDIR}/sdl)
SET(SDL_INC ${SDL}/include)
SET(SDL_LIB SDL)
@@ -347,6 +360,12 @@
SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
+ IF(WITH_OPENMP)
+ SET(LLIBS "${LLIBS} -lgomp ")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
+ ENDIF(WITH_OPENMP)
+
SET(SDL ${LIBDIR}/sdl)
SET(SDL_INC ${SDL}/include)
SET(SDL_LIB SDL)
@@ -366,6 +385,11 @@
SET(EXETYPE MACOSX_BUNDLE)
ENDIF(APPLE)
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
+ SET(BINRELOC_INC ${BINRELOC}/include)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
#-----------------------------------------------------------------------------
# Common.
SET(VERSE_INC ${CMAKE_SOURCE_DIR}/extern/verse/dist)
@@ -384,6 +408,9 @@
IF(WITH_GAMEENGINE)
SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DGAMEBLENDER ")
ENDIF(WITH_GAMEENGINE)
+IF(WITH_BULLET)
+ SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DWITH_BULLET ")
+ENDIF(WITH_BULLET)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS} ")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS} ")
Modified: branches/soc-2007-joeedh/SConstruct
===================================================================
--- branches/soc-2007-joeedh/SConstruct 2008-02-01 12:47:20 UTC (rev 13513)
+++ branches/soc-2007-joeedh/SConstruct 2008-02-01 18:27:28 UTC (rev 13514)
@@ -179,6 +179,18 @@
env['CXXFLAGS'].append('-DDISABLE_ELBEEM')
env['CCFLAGS'].append('-DDISABLE_ELBEEM')
+if env['WITH_BF_OPENMP'] == 1:
+ if env['OURPLATFORM']=='win32-vc':
+ env.Append(LINKFLAGS=['/openmp'])
+ 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')
+
#check for additional debug libnames
if env.has_key('BF_DEBUG_LIBS'):
@@ -401,7 +413,7 @@
'${LCGDIR}/zlib/lib/zlib.dll',
'${LCGDIR}/tiff/lib/libtiff.dll']
if env['BF_DEBUG']:
- dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}.dll')
+ dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}_d.dll')
else:
dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}.dll')
if env['OURPLATFORM'] == 'win32-mingw':
Modified: branches/soc-2007-joeedh/config/linux2-config.py
===================================================================
--- branches/soc-2007-joeedh/config/linux2-config.py 2008-02-01 12:47:20 UTC (rev 13513)
+++ branches/soc-2007-joeedh/config/linux2-config.py 2008-02-01 18:27:28 UTC (rev 13514)
@@ -29,8 +29,12 @@
WITH_BF_OPENEXR = 'true'
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_LIBPATH = '${BF_OPENEXR}/lib'
WITH_BF_DDS = 'true'
@@ -114,6 +118,8 @@
BF_ICONV_LIB = 'iconv'
BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+WITH_BF_BINRELOC = 'true'
+
# enable ffmpeg support
WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG
BF_FFMPEG = '#extern/ffmpeg'
Modified: branches/soc-2007-joeedh/config/win32-vc-config.py
===================================================================
--- branches/soc-2007-joeedh/config/win32-vc-config.py 2008-02-01 12:47:20 UTC (rev 13513)
+++ branches/soc-2007-joeedh/config/win32-vc-config.py 2008-02-01 18:27:28 UTC (rev 13514)
@@ -106,6 +106,8 @@
WITH_BF_YAFRAY = 'true'
+WITH_BF_BINRELOC = 'false'
+
#WITH_BF_NSPR = 'true'
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
Modified: branches/soc-2007-joeedh/extern/CMakeLists.txt
===================================================================
--- branches/soc-2007-joeedh/extern/CMakeLists.txt 2008-02-01 12:47:20 UTC (rev 13513)
+++ branches/soc-2007-joeedh/extern/CMakeLists.txt 2008-02-01 18:27:28 UTC (rev 13514)
@@ -29,11 +29,11 @@
IF(WITH_GAMEENGINE)
SUBDIRS(qhull solid)
+ENDIF(WITH_GAMEENGINE)
- IF(WITH_BULLET)
+IF(WITH_BULLET)
SUBDIRS(bullet2)
- ENDIF(WITH_BULLET)
-ENDIF(WITH_GAMEENGINE)
+ENDIF(WITH_BULLET)
IF(WITH_INTERNATIONAL)
SUBDIRS(bFTGL)
@@ -43,3 +43,6 @@
SUBDIRS(verse)
ENDIF(WITH_VERSE)
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ SUBDIRS(binreloc)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
Modified: branches/soc-2007-joeedh/extern/Makefile
===================================================================
--- branches/soc-2007-joeedh/extern/Makefile 2008-02-01 12:47:20 UTC (rev 13513)
+++ branches/soc-2007-joeedh/extern/Makefile 2008-02-01 18:27:28 UTC (rev 13514)
@@ -56,6 +56,10 @@
DIRS += bullet2
endif
+ifeq ($(WITH_BINRELOC), true)
+ DIRS += binreloc
+endif
+
TARGET =
ifneq ($(OS),irix)
TARGET=solid
Modified: branches/soc-2007-joeedh/extern/SConscript
===================================================================
--- branches/soc-2007-joeedh/extern/SConscript 2008-02-01 12:47:20 UTC (rev 13513)
+++ branches/soc-2007-joeedh/extern/SConscript 2008-02-01 18:27:28 UTC (rev 13514)
@@ -5,9 +5,10 @@
if env['WITH_BF_GAMEENGINE']:
SConscript(['qhull/SConscript',
'solid/SConscript'])
- if env['WITH_BF_BULLET']:
- SConscript(['bullet2/src/SConscript'])
+if env['WITH_BF_BULLET']:
+ SConscript(['bullet2/src/SConscript'])
+
if env['WITH_BF_INTERNATIONAL']:
SConscript(['bFTGL/SConscript'])
@@ -16,3 +17,6 @@
if env['WITH_BF_FFMPEG'] and env['BF_FFMPEG_LIB'] == '':
SConscript(['ffmpeg/SConscript']);
+
+if env['OURPLATFORM'] == 'linux2':
+ SConscript(['binreloc/SConscript']);
\ No newline at end of file
Copied: branches/soc-2007-joeedh/extern/binreloc (from rev 13491, trunk/blender/extern/binreloc)
Deleted: branches/soc-2007-joeedh/extern/binreloc/CMakeLists.txt
===================================================================
--- trunk/blender/extern/binreloc/CMakeLists.txt 2008-01-31 02:36:16 UTC (rev 13491)
+++ branches/soc-2007-joeedh/extern/binreloc/CMakeLists.txt 2008-02-01 18:27:28 UTC (rev 13514)
@@ -1,26 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# The Original Code is Copyright (C) 2008 by The Blender Foundation
-# All rights reserved.
-#
-
-SET(INC ./include ${WINTAB_INC})
-ADD_DEFINITIONS(-DWITH_BINRELOC)
-FILE(GLOB SRC *.c)
-
-BLENDERLIB(extern_binreloc "${SRC}" "${INC}")
-#, libtype=['core','player'], priority = [25,15] )
Copied: branches/soc-2007-joeedh/extern/binreloc/CMakeLists.txt (from rev 13491, trunk/blender/extern/binreloc/CMakeLists.txt)
===================================================================
--- branches/soc-2007-joeedh/extern/binreloc/CMakeLists.txt (rev 0)
+++ branches/soc-2007-joeedh/extern/binreloc/CMakeLists.txt 2008-02-01 18:27:28 UTC (rev 13514)
@@ -0,0 +1,26 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list