Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Hughes <khughes@pacific.edu>2006-06-05 19:52:26 +0400
committerKen Hughes <khughes@pacific.edu>2006-06-05 19:52:26 +0400
commita57bb6bee1714624fe9391c3fe99650a1ef08f79 (patch)
tree934e018a0371784b0d4c12ee4fedcc2f0cad7272 /extern/bullet
parent10bc1926040f014f38d0b8c6b9687e0b772928f8 (diff)
Bugfix #4081: support for OpenBSD platform for scons. Big thanks to Nathan Houghton for this contribution.
Diffstat (limited to 'extern/bullet')
-rw-r--r--extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp2
-rw-r--r--extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp2
-rw-r--r--extern/bullet/SConscript2
3 files changed, 3 insertions, 3 deletions
diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp b/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp
index 8febbe2ec06..2d91b4a3fd0 100644
--- a/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp
+++ b/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp
@@ -42,7 +42,7 @@ subject to the following restrictions:
#if defined (WIN32)
#include <malloc.h>
#else
-#if defined (__FreeBSD__)
+#if defined (__FreeBSD__) || defined (__OpenBSD__)
#include <stdlib.h>
#else
#include <alloca.h>
diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp b/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp
index 44ed3f0570b..d7c374d937f 100644
--- a/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp
+++ b/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp
@@ -42,7 +42,7 @@
#if defined (WIN32)
#include <malloc.h>
#else
-#if defined (__FreeBSD__)
+#if defined (__FreeBSD__) || defined (__OpenBSD__)
#include <stdlib.h>
#else
#include <alloca.h>
diff --git a/extern/bullet/SConscript b/extern/bullet/SConscript
index dc54eb6e4db..dfad7c3dc86 100644
--- a/extern/bullet/SConscript
+++ b/extern/bullet/SConscript
@@ -14,7 +14,7 @@ if env['OURPLATFORM']=='win32-vc':
elif env['OURPLATFORM']=='win32-mingw':
defs += ' NDEBUG'
cflags += ['-O2']
-elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5':
+elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5' or sys.platform=='openbsd3':
defs += ' NDEBUG'
cflags += ['-O2']
elif sys.platform=='darwin':