diff options
25 files changed, 54 insertions, 0 deletions
diff --git a/build_files/scons/config/linux2-config.py b/build_files/scons/config/linux2-config.py index 07ff30763c0..5afc2234c7b 100644 --- a/build_files/scons/config/linux2-config.py +++ b/build_files/scons/config/linux2-config.py @@ -193,6 +193,8 @@ CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFIL 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', ] diff --git a/extern/Eigen2/Eigen/Core b/extern/Eigen2/Eigen/Core index f5e315a2c9d..ad19f0883a3 100644 --- a/extern/Eigen2/Eigen/Core +++ b/extern/Eigen2/Eigen/Core @@ -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 diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt index 5f8901a646c..a8f8801af70 100644 --- a/extern/bullet2/CMakeLists.txt +++ b/extern/bullet2/CMakeLists.txt @@ -319,4 +319,9 @@ set(SRC 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}") diff --git a/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp b/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp index 50700e39203..04c780cdf8e 100644 --- a/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp +++ b/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp @@ -20,6 +20,9 @@ * */ +/* for types only, not alloc functions */ +#include <malloc.h> + #include "MEM_CacheLimiter.h" #include "MEM_CacheLimiterC-Api.h" diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 25afdf95f05..7f334a9f1ad 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -28,6 +28,7 @@ #include <stdlib.h> #include <stdio.h> +#include <stddef.h> #include <string> diff --git a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp index 3e9217251b5..6fe996992c8 100644 --- a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp +++ b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp @@ -23,6 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "SCA_IActuator.h" #include "SCA_2DFilterActuator.h" diff --git a/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp b/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp index d6c328cd730..a93ac2207e1 100644 --- a/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp +++ b/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp @@ -29,6 +29,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include <iostream> #include "SCA_ActuatorSensor.h" #include "SCA_EventManager.h" diff --git a/source/gameengine/GameLogic/SCA_DelaySensor.cpp b/source/gameengine/GameLogic/SCA_DelaySensor.cpp index abe72fb6757..e23135eb14f 100644 --- a/source/gameengine/GameLogic/SCA_DelaySensor.cpp +++ b/source/gameengine/GameLogic/SCA_DelaySensor.cpp @@ -35,6 +35,8 @@ #pragma warning( disable : 4786 ) #endif +#include <stddef.h> + #include "SCA_DelaySensor.h" #include "SCA_LogicManager.h" #include "SCA_EventManager.h" diff --git a/source/gameengine/GameLogic/SCA_IController.cpp b/source/gameengine/GameLogic/SCA_IController.cpp index 0c6b8350bca..6134b229266 100644 --- a/source/gameengine/GameLogic/SCA_IController.cpp +++ b/source/gameengine/GameLogic/SCA_IController.cpp @@ -26,6 +26,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "SCA_IController.h" #include "SCA_LogicManager.h" #include "SCA_IActuator.h" diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.cpp b/source/gameengine/GameLogic/SCA_ILogicBrick.cpp index afda218c99c..6fa83994bd6 100644 --- a/source/gameengine/GameLogic/SCA_ILogicBrick.cpp +++ b/source/gameengine/GameLogic/SCA_ILogicBrick.cpp @@ -26,6 +26,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "SCA_ILogicBrick.h" #include "PyObjectPlus.h" diff --git a/source/gameengine/GameLogic/SCA_ISensor.cpp b/source/gameengine/GameLogic/SCA_ISensor.cpp index c655924aa48..bb86b3735bc 100644 --- a/source/gameengine/GameLogic/SCA_ISensor.cpp +++ b/source/gameengine/GameLogic/SCA_ISensor.cpp @@ -29,6 +29,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "SCA_ISensor.h" #include "SCA_EventManager.h" #include "SCA_LogicManager.h" diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp index fe4124eb833..7368869bc2d 100644 --- a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp +++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp @@ -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" diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.cpp b/source/gameengine/GameLogic/SCA_MouseSensor.cpp index af11353c93e..257a67ad947 100644 --- a/source/gameengine/GameLogic/SCA_MouseSensor.cpp +++ b/source/gameengine/GameLogic/SCA_MouseSensor.cpp @@ -30,6 +30,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "SCA_MouseSensor.h" #include "SCA_EventManager.h" #include "SCA_MouseManager.h" diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp index a5ac5654e21..bc6604bebd8 100644 --- a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp +++ b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp @@ -29,6 +29,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "SCA_PropertyActuator.h" #include "InputParser.h" #include "Operator2Expr.h" diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.cpp b/source/gameengine/GameLogic/SCA_PropertySensor.cpp index a32cc50fd63..55cd2713c35 100644 --- a/source/gameengine/GameLogic/SCA_PropertySensor.cpp +++ b/source/gameengine/GameLogic/SCA_PropertySensor.cpp @@ -29,6 +29,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include <iostream> #include "SCA_PropertySensor.h" #include "Operator2Expr.h" diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp index b6671c45d7d..bf481b8e799 100644 --- a/source/gameengine/GameLogic/SCA_PythonController.cpp +++ b/source/gameengine/GameLogic/SCA_PythonController.cpp @@ -29,6 +29,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "SCA_PythonController.h" #include "SCA_LogicManager.h" #include "SCA_ISensor.h" diff --git a/source/gameengine/GameLogic/SCA_RandomActuator.cpp b/source/gameengine/GameLogic/SCA_RandomActuator.cpp index c3d5988be24..76bcf52c295 100644 --- a/source/gameengine/GameLogic/SCA_RandomActuator.cpp +++ b/source/gameengine/GameLogic/SCA_RandomActuator.cpp @@ -29,6 +29,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "BoolValue.h" #include "IntValue.h" #include "FloatValue.h" diff --git a/source/gameengine/GameLogic/SCA_RandomSensor.cpp b/source/gameengine/GameLogic/SCA_RandomSensor.cpp index 8194f1c97c8..8b18641c165 100644 --- a/source/gameengine/GameLogic/SCA_RandomSensor.cpp +++ b/source/gameengine/GameLogic/SCA_RandomSensor.cpp @@ -29,6 +29,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "SCA_RandomSensor.h" #include "SCA_EventManager.h" #include "SCA_RandomEventManager.h" diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp index 0f563dc4fe4..3ac95d7eaf8 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp @@ -28,6 +28,8 @@ * Ketsji Logic Extenstion: Network Message Actuator generic implementation */ +#include <stddef.h> + #include "NG_NetworkScene.h" #include "KX_NetworkMessageActuator.h" diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp index 91b05990ba1..5d05534b258 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp @@ -28,6 +28,8 @@ * Ketsji Logic Extenstion: Network Message Sensor generic implementation */ +#include <stddef.h> + #include "KX_NetworkMessageSensor.h" #include "KX_NetworkEventManager.h" #include "NG_NetworkMessage.h" diff --git a/source/gameengine/Ketsji/KX_GameActuator.cpp b/source/gameengine/Ketsji/KX_GameActuator.cpp index 1a195913e4a..4929187c3ee 100644 --- a/source/gameengine/Ketsji/KX_GameActuator.cpp +++ b/source/gameengine/Ketsji/KX_GameActuator.cpp @@ -29,6 +29,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "SCA_IActuator.h" #include "KX_GameActuator.h" //#include <iostream> diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h index 640816e19ca..974dde6de00 100644 --- a/source/gameengine/Ketsji/KX_GameObject.h +++ b/source/gameengine/Ketsji/KX_GameObject.h @@ -36,6 +36,7 @@ #pragma warning (disable : 4355) #endif +#include <stddef.h> #include "ListValue.h" #include "SCA_IObject.h" diff --git a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp index 1f4a3491695..39f017625dd 100644 --- a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp +++ b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp @@ -25,6 +25,9 @@ * * ***** END GPL LICENSE BLOCK ***** */ + +#include <stddef.h> + #include "KX_PolygonMaterial.h" #include "BKE_mesh.h" diff --git a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp index 51a3979830d..aff4f4080fd 100644 --- a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp +++ b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp @@ -35,6 +35,8 @@ // Please look here for revision history. +#include <stddef.h> + #include "KX_SCA_ReplaceMeshActuator.h" #include "KX_MeshProxy.h" diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp index 524cffc2732..86223a0ea60 100644 --- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp @@ -26,6 +26,9 @@ * * ***** END GPL LICENSE BLOCK ***** */ + +#include <stddef.h> + #include "DummyPhysicsEnvironment.h" #include "PHY_IMotionState.h" |