diff options
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/Eigen2/Eigen/Core | 1 | ||||
| -rw-r--r-- | extern/bullet2/CMakeLists.txt | 5 |
2 files changed, 6 insertions, 0 deletions
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}") |