[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45968] branches/ge_harmony: Merged revisions 45832-45967 from trunk/blender

Daniel Stokes kupomail at gmail.com
Thu Apr 26 05:10:27 CEST 2012 

Revision: 45968
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45968
Author:   kupoman
Date:     2012-04-26 03:10:21 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Merged revisions 45832-45967 from trunk/blender

Modified Paths:
--------------
    branches/ge_harmony/CMakeLists.txt
    branches/ge_harmony/SConstruct
    branches/ge_harmony/build_files/cmake/macros.cmake
    branches/ge_harmony/build_files/scons/config/win32-mingw-config.py
    branches/ge_harmony/build_files/scons/tools/Blender.py
    branches/ge_harmony/build_files/scons/tools/btools.py
    branches/ge_harmony/doc/python_api/rst/include__bmesh.rst
    branches/ge_harmony/doc/python_api/rst/info_gotcha.rst
    branches/ge_harmony/doc/python_api/sphinx_doc_gen.py
    branches/ge_harmony/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
    branches/ge_harmony/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
    branches/ge_harmony/extern/bullet2/src/SConscript
    branches/ge_harmony/extern/carve/SConscript
    branches/ge_harmony/extern/carve/bundle.sh
    branches/ge_harmony/extern/eltopo/SConscript
    branches/ge_harmony/extern/libmv/SConscript
    branches/ge_harmony/extern/libmv/bundle.sh
    branches/ge_harmony/extern/libmv/libmv/numeric/numeric.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/windows/port.cc
    branches/ge_harmony/extern/libmv/third_party/glog/src/windows/port.h
    branches/ge_harmony/intern/SConscript
    branches/ge_harmony/intern/audaspace/SConscript
    branches/ge_harmony/intern/boolop/SConscript
    branches/ge_harmony/intern/cycles/SConscript
    branches/ge_harmony/intern/cycles/blender/blender_mesh.cpp
    branches/ge_harmony/intern/cycles/kernel/svm/svm_types.h
    branches/ge_harmony/intern/elbeem/intern/ntl_geometrymodel.cpp
    branches/ge_harmony/intern/elbeem/intern/ntl_world.cpp
    branches/ge_harmony/intern/elbeem/intern/solver_relax.h
    branches/ge_harmony/intern/ghost/SConscript
    branches/ge_harmony/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/ge_harmony/intern/guardedalloc/MEM_sys_types.h
    branches/ge_harmony/intern/opennl/SConscript
    branches/ge_harmony/intern/utfconv/SConscript
    branches/ge_harmony/release/scripts/startup/bl_operators/mesh.py
    branches/ge_harmony/release/scripts/startup/bl_operators/object.py
    branches/ge_harmony/release/scripts/startup/bl_operators/uvcalc_follow_active.py
    branches/ge_harmony/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/ge_harmony/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d.py
    branches/ge_harmony/release/windows/installer/00.sconsblender.nsi
    branches/ge_harmony/source/SConscript
    branches/ge_harmony/source/blender/blenkernel/BKE_armature.h
    branches/ge_harmony/source/blender/blenkernel/BKE_image.h
    branches/ge_harmony/source/blender/blenkernel/BKE_mesh.h
    branches/ge_harmony/source/blender/blenkernel/BKE_report.h
    branches/ge_harmony/source/blender/blenkernel/BKE_subsurf.h
    branches/ge_harmony/source/blender/blenkernel/BKE_tessmesh.h
    branches/ge_harmony/source/blender/blenkernel/SConscript
    branches/ge_harmony/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/ge_harmony/source/blender/blenkernel/intern/DerivedMesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/anim_sys.c
    branches/ge_harmony/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/collision.c
    branches/ge_harmony/source/blender/blenkernel/intern/customdata.c
    branches/ge_harmony/source/blender/blenkernel/intern/depsgraph.c
    branches/ge_harmony/source/blender/blenkernel/intern/dynamicpaint.c
    branches/ge_harmony/source/blender/blenkernel/intern/idprop.c
    branches/ge_harmony/source/blender/blenkernel/intern/image.c
    branches/ge_harmony/source/blender/blenkernel/intern/implicit.c
    branches/ge_harmony/source/blender/blenkernel/intern/ipo.c
    branches/ge_harmony/source/blender/blenkernel/intern/library.c
    branches/ge_harmony/source/blender/blenkernel/intern/material.c
    branches/ge_harmony/source/blender/blenkernel/intern/mball.c
    branches/ge_harmony/source/blender/blenkernel/intern/mesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/mesh_validate.c
    branches/ge_harmony/source/blender/blenkernel/intern/multires.c
    branches/ge_harmony/source/blender/blenkernel/intern/packedFile.c
    branches/ge_harmony/source/blender/blenkernel/intern/paint.c
    branches/ge_harmony/source/blender/blenkernel/intern/particle.c
    branches/ge_harmony/source/blender/blenkernel/intern/scene.c
    branches/ge_harmony/source/blender/blenkernel/intern/seqeffects.c
    branches/ge_harmony/source/blender/blenkernel/intern/sequencer.c
    branches/ge_harmony/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/ge_harmony/source/blender/blenkernel/intern/text.c
    branches/ge_harmony/source/blender/blenkernel/intern/texture.c
    branches/ge_harmony/source/blender/blenkernel/intern/writeffmpeg.c
    branches/ge_harmony/source/blender/blenlib/BLI_array.h
    branches/ge_harmony/source/blender/blenlib/BLI_math_vector.h
    branches/ge_harmony/source/blender/blenlib/BLI_pbvh.h
    branches/ge_harmony/source/blender/blenlib/BLI_winstuff.h
    branches/ge_harmony/source/blender/blenlib/SConscript
    branches/ge_harmony/source/blender/blenlib/intern/fileops.c
    branches/ge_harmony/source/blender/blenlib/intern/fnmatch.c
    branches/ge_harmony/source/blender/blenlib/intern/math_geom.c
    branches/ge_harmony/source/blender/blenlib/intern/math_vector.c
    branches/ge_harmony/source/blender/blenlib/intern/storage.c
    branches/ge_harmony/source/blender/blenloader/BLO_sys_types.h
    branches/ge_harmony/source/blender/blenloader/intern/readfile.c
    branches/ge_harmony/source/blender/blenloader/intern/writefile.c
    branches/ge_harmony/source/blender/blenpluginapi/SConscript
    branches/ge_harmony/source/blender/bmesh/CMakeLists.txt
    branches/ge_harmony/source/blender/bmesh/SConscript
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_construct.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_core.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_marking.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_marking.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mods.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mods.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operators.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_polygon.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_polygon.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_private.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_queries.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_queries.h
    branches/ge_harmony/source/blender/bmesh/operators/bmo_dissolve.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_extrude.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_inset.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_primitive.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_removedoubles.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_slide.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_subdivide.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_subdivide.h
    branches/ge_harmony/source/blender/bmesh/operators/bmo_triangulate.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_utils.c
    branches/ge_harmony/source/blender/bmesh/tools/BME_bevel.c
    branches/ge_harmony/source/blender/editors/armature/SConscript
    branches/ge_harmony/source/blender/editors/armature/poselib.c
    branches/ge_harmony/source/blender/editors/datafiles/startup.blend.c
    branches/ge_harmony/source/blender/editors/include/BIF_glutil.h
    branches/ge_harmony/source/blender/editors/include/ED_mesh.h
    branches/ge_harmony/source/blender/editors/include/ED_numinput.h
    branches/ge_harmony/source/blender/editors/include/ED_uvedit.h
    branches/ge_harmony/source/blender/editors/include/ED_view3d.h
    branches/ge_harmony/source/blender/editors/include/UI_interface.h
    branches/ge_harmony/source/blender/editors/interface/interface_layout.c
    branches/ge_harmony/source/blender/editors/interface/interface_utils.c
    branches/ge_harmony/source/blender/editors/interface/interface_widgets.c
    branches/ge_harmony/source/blender/editors/mesh/SConscript
    branches/ge_harmony/source/blender/editors/mesh/editmesh_knife.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_loopcut.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_rip.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_select.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_slide.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_tools.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_utils.c
    branches/ge_harmony/source/blender/editors/mesh/mesh_data.c
    branches/ge_harmony/source/blender/editors/mesh/mesh_intern.h
    branches/ge_harmony/source/blender/editors/mesh/mesh_ops.c
    branches/ge_harmony/source/blender/editors/object/SConscript
    branches/ge_harmony/source/blender/editors/object/object_group.c
    branches/ge_harmony/source/blender/editors/object/object_relations.c
    branches/ge_harmony/source/blender/editors/object/object_vgroup.c
    branches/ge_harmony/source/blender/editors/physics/SConscript
    branches/ge_harmony/source/blender/editors/render/SConscript
    branches/ge_harmony/source/blender/editors/render/render_internal.c
    branches/ge_harmony/source/blender/editors/render/render_preview.c
    branches/ge_harmony/source/blender/editors/render/render_update.c
    branches/ge_harmony/source/blender/editors/screen/SConscript
    branches/ge_harmony/source/blender/editors/screen/glutil.c
    branches/ge_harmony/source/blender/editors/screen/screendump.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/SConscript
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_hide.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_image.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_ops.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/sculpt.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/sculpt_uv.c
    branches/ge_harmony/source/blender/editors/space_file/SConscript
    branches/ge_harmony/source/blender/editors/space_image/SConscript
    branches/ge_harmony/source/blender/editors/space_image/image_buttons.c
    branches/ge_harmony/source/blender/editors/space_image/image_ops.c
    branches/ge_harmony/source/blender/editors/space_image/space_image.c
    branches/ge_harmony/source/blender/editors/space_node/SConscript
    branches/ge_harmony/source/blender/editors/space_node/node_select.c
    branches/ge_harmony/source/blender/editors/space_sequencer/SConscript
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/ge_harmony/source/blender/editors/space_text/text_python.c
    branches/ge_harmony/source/blender/editors/space_view3d/SConscript
    branches/ge_harmony/source/blender/editors/space_view3d/drawmesh.c
    branches/ge_harmony/source/blender/editors/space_view3d/drawobject.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_draw.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_edit.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_select.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_snap.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_view.c
    branches/ge_harmony/source/blender/editors/transform/transform.c
    branches/ge_harmony/source/blender/editors/transform/transform_conversions.c
    branches/ge_harmony/source/blender/editors/transform/transform_generics.c
    branches/ge_harmony/source/blender/editors/transform/transform_manipulator.c
    branches/ge_harmony/source/blender/editors/transform/transform_orientations.c
    branches/ge_harmony/source/blender/editors/util/ed_util.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_buttons.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_draw.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_ops.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/ge_harmony/source/blender/gpu/SConscript
    branches/ge_harmony/source/blender/gpu/intern/gpu_buffers.c
    branches/ge_harmony/source/blender/gpu/intern/gpu_codegen.c
    branches/ge_harmony/source/blender/imbuf/SConscript
    branches/ge_harmony/source/blender/imbuf/intern/indexer.c
    branches/ge_harmony/source/blender/imbuf/intern/jp2.c
    branches/ge_harmony/source/blender/imbuf/intern/tiff.c
    branches/ge_harmony/source/blender/imbuf/intern/util.c
    branches/ge_harmony/source/blender/makesdna/DNA_meshdata_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_scene_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_sequence_types.h
    branches/ge_harmony/source/blender/makesdna/intern/SConscript
    branches/ge_harmony/source/blender/makesrna/RNA_enum_types.h
    branches/ge_harmony/source/blender/makesrna/SConscript
    branches/ge_harmony/source/blender/makesrna/intern/SConscript
    branches/ge_harmony/source/blender/makesrna/intern/rna_actuator.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_brush.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_curve.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_image.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_key.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_main_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_mesh.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_meta.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_nodetree.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_object.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_object_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_scene.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_texture.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_tracking.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_userdef.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_array.c
    branches/ge_harmony/source/blender/nodes/SConscript
    branches/ge_harmony/source/blender/nodes/intern/node_common.c
    branches/ge_harmony/source/blender/python/SConscript
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types_customdata.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_utils.c
    branches/ge_harmony/source/blender/python/intern/bpy_interface.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils.h
    branches/ge_harmony/source/blender/python/mathutils/mathutils_geometry.c
    branches/ge_harmony/source/blender/render/SConscript
    branches/ge_harmony/source/blender/render/intern/source/convertblender.c
    branches/ge_harmony/source/blender/windowmanager/SConscript
    branches/ge_harmony/source/blender/windowmanager/WM_api.h
    branches/ge_harmony/source/blender/windowmanager/intern/wm_event_system.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_jobs.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_keymap.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_operators.c
    branches/ge_harmony/source/creator/CMakeLists.txt
    branches/ge_harmony/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/ge_harmony/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/ge_harmony/source/gameengine/Converter/SConscript
    branches/ge_harmony/source/gameengine/Expressions/KX_HashedPtr.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_IPO_SGController.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_SteeringActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_SteeringActuator.h
    branches/ge_harmony/source/gameengine/Ketsji/SConscript
    branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/SConscript
    branches/ge_harmony/source/tests/bl_mesh_modifiers.py
    branches/ge_harmony/source/tools/uncrustify_clean.sh

Added Paths:
-----------
    branches/ge_harmony/build_files/scons/config/win64-mingw-config.py
    branches/ge_harmony/doc/python_api/examples/bpy.types.Mesh.py
    branches/ge_harmony/extern/carve/patches/mingw_w64.patch
    branches/ge_harmony/extern/libmv/patches/mingw_w64_support.patch

Property Changed:
----------------
    branches/ge_harmony/


Property changes on: branches/ge_harmony
___________________________________________________________________
Modified: svn:ignore
   - *.pdb
.*
TAGS
cscope.out
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
CMakeFiles
CMakeCache.txt
blender.bin

   + *.pdb
.*
TAGS
cscope.out
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
CMakeFiles
CMakeCache.txt
blender.bin
blender.kdev4
.kdev4

Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:42243-45832
   + /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:42243-45967

Modified: branches/ge_harmony/CMakeLists.txt
===================================================================
--- branches/ge_harmony/CMakeLists.txt	2012-04-26 02:32:00 UTC (rev 45967)
+++ branches/ge_harmony/CMakeLists.txt	2012-04-26 03:10:21 UTC (rev 45968)
@@ -194,12 +194,7 @@
 option(WITH_IMAGE_FRAMESERVER   "Enable image FrameServer Support for rendering" ON)
 
 # Audio/Video format support
-if(MINGW)
-	set(PLATFORM_DEFAULT ON)
-else()
-	set(PLATFORM_DEFAULT OFF)
-endif()
-option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.org)" ${PLATFORM_DEFAULT})
+option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
 unset(PLATFORM_DEFAULT)
 
 option(WITH_CODEC_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
@@ -233,6 +228,8 @@
 	option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
 endif()
 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
+option(WITH_MINGW64                   "Use the 64-bit version of MinGW" OFF)
+mark_as_advanced(WITH_MINGW64)
 
 # Cycles
 option(WITH_CYCLES					"Enable cycles Render Engine" ON)
@@ -370,10 +367,9 @@
 		                    "because it is currently unsupported, remove this "
 		                    "line if youre a developer who wants to add support.")
 	endif()
-
-	if((NOT WITH_CODEC_FFMPEG) AND (WITH_CYCLES OR WITH_IMAGE_OPENEXR OR WITH_IMAGE_TIFF))
-		message(FATAL_ERROR "MINGW has a problem with: WITH_CYCLES/WITH_IMAGE_OPENEXR/WITH_IMAGE_TIFF "
-		                    "when WITH_CODEC_FFMPEG is disabled, enable FFMPEG or disable CYCLES/EXR/TIFF.")
+	
+	if((WITH_MINGW64) AND (WITH_OPENCOLLADA OR WITH_CODEC_FFMPEG))
+		message(FATAL_ERROR "MINGW64 still doesn't support: WITH_OPENCOLLADA/WITH_CODEC_FFMPEG")
 	endif()
 endif()
 
@@ -740,14 +736,24 @@
 	# this file is included anyway when building under Windows with cl.exe
 	#  include(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
 
-	set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
+	if(CMAKE_COMPILER_IS_GNUCC)
+		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)
 
-	# Setup 64bit and 64bit windows systems
-	if(CMAKE_CL_64)
-		message("64 bit compiler detected.")
-		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
+		# Setup 64bit and 64bit windows systems		
+		if(WITH_MINGW64)
+			message("Set 64 bit compiler for MinGW.")
+			set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64)
+		endif()
+	else()
+		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
+
+		# Setup 64bit and 64bit windows systems
+		if(CMAKE_CL_64)
+			message("64 bit compiler detected.")
+			set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
+		endif()
 	endif()
-
+		
 	add_definitions(-DWIN32)
 
 	if(WITH_INTERNATIONAL)
@@ -995,29 +1001,41 @@
 
 		set(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib")
 
-	else()
-		# keep GCC specific stuff here
-		if(CMAKE_COMPILER_IS_GNUCC)
-			set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32 -lpsapi")
-			set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
+	elseif(CMAKE_COMPILER_IS_GNUCC)
+	# keep GCC specific stuff here		
+		set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32 -lpsapi")
+		set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
 
-			add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
+		if(WITH_MINGW64)
+			#Yes, the point for MinGW64 is moar optimization by default :)
+			set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -msse -msse2 -ftree-vectorize")
+			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
+			set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
+			
+			add_definitions(-DFREE_WINDOWS64 -DMS_WIN64)
 		endif()
 
+		add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
+
+
 		add_definitions(-DFREE_WINDOWS)
 
 		if(WITH_INTERNATIONAL)
-			set(GETTEXT ${LIBDIR}/gcc/gettext)
+			set(GETTEXT ${LIBDIR}/gettext)
 			set(GETTEXT_INCLUDE_DIRS ${GETTEXT}/include)
 			set(GETTEXT_LIBPATH ${GETTEXT}/lib)
 			set(GETTEXT_LIBRARIES intl)
 		endif()
 		
-		set(PNG "${LIBDIR}/gcc/png")
+		set(PNG "${LIBDIR}/png")
 		set(PNG_INCLUDE_DIR "${PNG}/include")
 		set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
 
-		set(JPEG_LIBRARIES libjpeg)
+		if(WITH_MINGW64)
+			set(JPEG_LIBRARIES jpeg)
+		else()
+			set(JPEG_LIBRARIES libjpeg)
+		endif()
 		set(PNG_LIBRARIES png)
 
 		set(ZLIB ${LIBDIR}/zlib)
@@ -1025,31 +1043,34 @@
 		set(ZLIB_LIBPATH ${ZLIB}/lib)
 		set(ZLIB_LIBRARIES z)
 
-		set(PTHREADS ${LIBDIR}/pthreads)
-		set(PTHREADS_INCLUDE_DIRS ${PTHREADS}/include)
-		set(PTHREADS_LIBPATH ${PTHREADS}/lib)
-		set(PTHREADS_LIBRARIES pthreadGC2)
-
-		set(FREETYPE ${LIBDIR}/gcc/freetype)
+		#comes with own pthread library
+		if(NOT WITH_MINGW64)
+			set(PTHREADS ${LIBDIR}/pthreads)
+			set(PTHREADS_INCLUDE_DIRS ${PTHREADS}/include)
+			set(PTHREADS_LIBPATH ${PTHREADS}/lib)
+			set(PTHREADS_LIBRARIES pthreadGC2)
+		endif()
+		
+		set(FREETYPE ${LIBDIR}/freetype)
 		set(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
 		set(FREETYPE_LIBPATH ${FREETYPE}/lib)
 		set(FREETYPE_LIBRARY freetype)
 
 		if(WITH_FFTW3)
-			set(FFTW3 ${LIBDIR}/gcc/fftw3)
+			set(FFTW3 ${LIBDIR}/fftw3)
 			set(FFTW3_LIBRARIES fftw3)
 			set(FFTW3_INCLUDE_DIRS ${FFTW3}/include)
 			set(FFTW3_LIBPATH ${FFTW3}/lib)
 		endif()
 
 		if(WITH_OPENCOLLADA)
-			set(OPENCOLLADA ${LIBDIR}/gcc/opencollada)
+			set(OPENCOLLADA ${LIBDIR}/opencollada)
 			set(OPENCOLLADA_INCLUDE_DIRS
-				${LIBDIR}/gcc/opencollada/include/COLLADAStreamWriter/include
-				${LIBDIR}/gcc/opencollada/include/COLLADABaseUtils/include
-				${LIBDIR}/gcc/opencollada/include/COLLADAFramework/include
-				${LIBDIR}/gcc/opencollada/include/COLLADASaxFrameworkLoader/include
-				${LIBDIR}/gcc/opencollada/include/GeneratedSaxParser/include
+				${LIBDIR}/opencollada/include/COLLADAStreamWriter/include
+				${LIBDIR}/opencollada/include/COLLADABaseUtils/include
+				${LIBDIR}/opencollada/include/COLLADAFramework/include
+				${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
+				${LIBDIR}/opencollada/include/GeneratedSaxParser/include
 			)
 			set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
 			set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
@@ -1064,14 +1085,14 @@
 		endif()
 
 		if(WITH_IMAGE_OPENEXR)
-			set(OPENEXR ${LIBDIR}/gcc/openexr)
+			set(OPENEXR ${LIBDIR}/openexr)
 			set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
 			set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
 			set(OPENEXR_LIBPATH ${OPENEXR}/lib)
 		endif()
 
 		if(WITH_IMAGE_TIFF)
-			set(TIFF ${LIBDIR}/gcc/tiff)
+			set(TIFF ${LIBDIR}/tiff)
 			set(TIFF_LIBRARY tiff)
 			set(TIFF_INCLUDE_DIR ${TIFF}/include)
 			set(TIFF_LIBPATH ${TIFF}/lib)
@@ -1101,19 +1122,24 @@
 		if(WITH_BOOST)
 			set(BOOST ${LIBDIR}/boost)
 			set(BOOST_INCLUDE_DIR ${BOOST}/include)
-			set(BOOST_POSTFIX "mgw46-mt-s-1_47")
-			set(BOOST_DEBUG_POSTFIX "mgw46-mt-sd-1_47")
+			if(WITH_MINGW64)
+				set(BOOST_POSTFIX "mgw47-mt-s-1_49")
+				set(BOOST_DEBUG_POSTFIX "mgw47-mt-sd-1_49")
+			else()
+				set(BOOST_POSTFIX "mgw46-mt-s-1_47")
+				set(BOOST_DEBUG_POSTFIX "mgw46-mt-sd-1_47")
+			endif()		
 			set(BOOST_LIBRARIES
 				optimized boost_date_time-${BOOST_POSTFIX} boost_filesystem-${BOOST_POSTFIX}
 				boost_regex-${BOOST_POSTFIX} boost_system-${BOOST_POSTFIX} boost_thread-${BOOST_POSTFIX}
 				debug boost_date_time-${BOOST_DEBUG_POSTFIX} boost_filesystem-${BOOST_DEBUG_POSTFIX}
 				boost_regex-${BOOST_DEBUG_POSTFIX} boost_system-${BOOST_DEBUG_POSTFIX} boost_thread-${BOOST_DEBUG_POSTFIX})
-			set(BOOST_LIBPATH ${BOOST}/lib/gcc)
+			set(BOOST_LIBPATH ${BOOST}/lib)
 			set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB -DBOOST_THREAD_USE_LIB ")
 		endif()
 			
 		if(WITH_OPENIMAGEIO)
-			set(OPENIMAGEIO ${LIBDIR}/gcc/openimageio)
+			set(OPENIMAGEIO ${LIBDIR}/openimageio)
 			set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
 			set(OPENIMAGEIO_LIBRARIES OpenImageIO)
 			set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
@@ -1137,7 +1163,7 @@
 		set(WITH_LIBS10.5 ON CACHE BOOL "Use 10.5 libs" FORCE) # valid also for 10.6/10.7
 	endif()
 
-	if(${XCODE_VERSION} LESS 4.3)
+	if(${XCODE_VERSION} VERSION_LESS 4.3)
 		SET(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE ) # use guaranteed existing sdk
 	else()
 		# note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed

Modified: branches/ge_harmony/SConstruct
===================================================================
--- branches/ge_harmony/SConstruct	2012-04-26 02:32:00 UTC (rev 45967)
+++ branches/ge_harmony/SConstruct	2012-04-26 03:10:21 UTC (rev 45968)
@@ -170,7 +170,7 @@
     if env['CC'] in ['cl', 'cl.exe']:
         platform = 'win64-vc' if bitness == 64 else 'win32-vc'
     elif env['CC'] in ['gcc']:
-        platform = 'win32-mingw'

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list