[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34520] trunk/blender: [#25815] Patch gcc 4.6

Campbell Barton ideasman42 at gmail.com
Thu Jan 27 01:02:29 CET 2011 

Revision: 34520
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34520
Author:   campbellbarton
Date:     2011-01-27 00:02:25 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
[#25815] Patch gcc 4.6
with minor edits, made sure it works in CMake too.

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/linux2-config.py
    trunk/blender/extern/Eigen2/Eigen/Core
    trunk/blender/extern/bullet2/CMakeLists.txt
    trunk/blender/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
    trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_DelaySensor.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_IController.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_ISensor.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    trunk/blender/source/gameengine/Ketsji/KX_GameActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
    trunk/blender/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    trunk/blender/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    trunk/blender/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp

Modified: trunk/blender/build_files/scons/config/linux2-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linux2-config.py	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/build_files/scons/config/linux2-config.py	2011-01-27 00:02:25 UTC (rev 34520)
@@ -193,6 +193,8 @@
 
 CPPFLAGS = []
 CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
+# g++ 4.6, only needed for bullet
+CXXFLAGS += ['-fpermissive']
 if WITH_BF_FFMPEG:
   # libavutil needs UINT64_C()
   CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ]

Modified: trunk/blender/extern/Eigen2/Eigen/Core
===================================================================
--- trunk/blender/extern/Eigen2/Eigen/Core	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/extern/Eigen2/Eigen/Core	2011-01-27 00:02:25 UTC (rev 34520)
@@ -59,6 +59,7 @@
 #include <cstring>
 #include <string>
 #include <limits>
+#include <malloc.h>
 
 #if (defined(_CPPUNWIND) || defined(__EXCEPTIONS)) && !defined(EIGEN_NO_EXCEPTIONS)
   #define EIGEN_EXCEPTIONS

Modified: trunk/blender/extern/bullet2/CMakeLists.txt
===================================================================
--- trunk/blender/extern/bullet2/CMakeLists.txt	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/extern/bullet2/CMakeLists.txt	2011-01-27 00:02:25 UTC (rev 34520)
@@ -319,4 +319,9 @@
 	src/btBulletDynamicsCommon.h
 )
 
+if(CMAKE_COMPILER_IS_GNUCC)
+	# needed for gcc 4.6+
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
+endif()
+
 blender_add_lib(extern_bullet "${SRC}" "${INC}")

Modified: trunk/blender/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
===================================================================
--- trunk/blender/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp	2011-01-27 00:02:25 UTC (rev 34520)
@@ -20,6 +20,9 @@
  *
  */
 
+/* for types only, not alloc functions */
+#include <malloc.h>
+
 #include "MEM_CacheLimiter.h"
 #include "MEM_CacheLimiterC-Api.h"
 

Modified: trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp	2011-01-27 00:02:25 UTC (rev 34520)
@@ -28,6 +28,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stddef.h>
 #include <string>
 
 

Modified: trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp	2011-01-27 00:02:25 UTC (rev 34520)
@@ -23,6 +23,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <stddef.h>
+
 #include "SCA_IActuator.h"
 #include "SCA_2DFilterActuator.h"
 

Modified: trunk/blender/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp	2011-01-27 00:02:25 UTC (rev 34520)
@@ -29,6 +29,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <stddef.h>
+
 #include <iostream>
 #include "SCA_ActuatorSensor.h"
 #include "SCA_EventManager.h"

Modified: trunk/blender/source/gameengine/GameLogic/SCA_DelaySensor.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_DelaySensor.cpp	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/source/gameengine/GameLogic/SCA_DelaySensor.cpp	2011-01-27 00:02:25 UTC (rev 34520)
@@ -35,6 +35,8 @@
 #pragma warning( disable : 4786 )     
 #endif
 
+#include <stddef.h>
+
 #include "SCA_DelaySensor.h"
 #include "SCA_LogicManager.h"
 #include "SCA_EventManager.h"

Modified: trunk/blender/source/gameengine/GameLogic/SCA_IController.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_IController.cpp	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/source/gameengine/GameLogic/SCA_IController.cpp	2011-01-27 00:02:25 UTC (rev 34520)
@@ -26,6 +26,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <stddef.h>
+
 #include "SCA_IController.h"
 #include "SCA_LogicManager.h"
 #include "SCA_IActuator.h"

Modified: trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp	2011-01-27 00:02:25 UTC (rev 34520)
@@ -26,6 +26,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <stddef.h>
+
 #include "SCA_ILogicBrick.h"
 #include "PyObjectPlus.h"
 

Modified: trunk/blender/source/gameengine/GameLogic/SCA_ISensor.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_ISensor.cpp	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/source/gameengine/GameLogic/SCA_ISensor.cpp	2011-01-27 00:02:25 UTC (rev 34520)
@@ -29,6 +29,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <stddef.h>
+
 #include "SCA_ISensor.h"
 #include "SCA_EventManager.h"
 #include "SCA_LogicManager.h"

Modified: trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp	2011-01-27 00:02:25 UTC (rev 34520)
@@ -27,6 +27,9 @@
  * ***** END GPL LICENSE BLOCK *****
  * Sensor for keyboard input
  */
+
+#include <stddef.h>
+
 #include "SCA_KeyboardSensor.h"
 #include "SCA_KeyboardManager.h"
 #include "SCA_LogicManager.h"

Modified: trunk/blender/source/gameengine/GameLogic/SCA_MouseSensor.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_MouseSensor.cpp	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/source/gameengine/GameLogic/SCA_MouseSensor.cpp	2011-01-27 00:02:25 UTC (rev 34520)
@@ -30,6 +30,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <stddef.h>
+
 #include "SCA_MouseSensor.h"
 #include "SCA_EventManager.h"
 #include "SCA_MouseManager.h"

Modified: trunk/blender/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_PropertyActuator.cpp	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/source/gameengine/GameLogic/SCA_PropertyActuator.cpp	2011-01-27 00:02:25 UTC (rev 34520)
@@ -29,6 +29,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <stddef.h>
+
 #include "SCA_PropertyActuator.h"
 #include "InputParser.h"
 #include "Operator2Expr.h"

Modified: trunk/blender/source/gameengine/GameLogic/SCA_PropertySensor.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_PropertySensor.cpp	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/source/gameengine/GameLogic/SCA_PropertySensor.cpp	2011-01-27 00:02:25 UTC (rev 34520)
@@ -29,6 +29,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <stddef.h>
+
 #include <iostream>
 #include "SCA_PropertySensor.h"
 #include "Operator2Expr.h"

Modified: trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp	2011-01-27 00:02:25 UTC (rev 34520)
@@ -29,6 +29,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <stddef.h>
+
 #include "SCA_PythonController.h"
 #include "SCA_LogicManager.h"
 #include "SCA_ISensor.h"

Modified: trunk/blender/source/gameengine/GameLogic/SCA_RandomActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_RandomActuator.cpp	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/source/gameengine/GameLogic/SCA_RandomActuator.cpp	2011-01-27 00:02:25 UTC (rev 34520)
@@ -29,6 +29,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <stddef.h>
+
 #include "BoolValue.h"
 #include "IntValue.h"
 #include "FloatValue.h"

Modified: trunk/blender/source/gameengine/GameLogic/SCA_RandomSensor.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_RandomSensor.cpp	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/source/gameengine/GameLogic/SCA_RandomSensor.cpp	2011-01-27 00:02:25 UTC (rev 34520)
@@ -29,6 +29,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <stddef.h>
+
 #include "SCA_RandomSensor.h"
 #include "SCA_EventManager.h"
 #include "SCA_RandomEventManager.h"

Modified: trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp	2011-01-27 00:02:25 UTC (rev 34520)
@@ -28,6 +28,8 @@
  * Ketsji Logic Extenstion: Network Message Actuator generic implementation
  */
 
+#include <stddef.h>
+
 #include "NG_NetworkScene.h"
 #include "KX_NetworkMessageActuator.h"
 

Modified: trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp	2011-01-26 23:58:20 UTC (rev 34519)
+++ trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp	2011-01-27 00:02:25 UTC (rev 34520)
@@ -28,6 +28,8 @@

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list