diff options
| author | Hans Lambermont <hans@lambermont.dyndns.org> | 2005-12-27 23:37:15 +0300 |
|---|---|---|
| committer | Hans Lambermont <hans@lambermont.dyndns.org> | 2005-12-27 23:37:15 +0300 |
| commit | f0e7d217933a096e36b4a4aef67d11ec77f397b6 (patch) | |
| tree | 0daf657f4464c0f0bfc2739290858266635c1877 /extern | |
| parent | a61871360f3920a54fdb1acaaccb6cd5a4e61f85 (diff) | |
- include path and file changes for FreeBSD
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/bFTGL/src/Makefile | 1 | ||||
| -rw-r--r-- | extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp | 6 | ||||
| -rw-r--r-- | extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp | 8 |
3 files changed, 12 insertions, 3 deletions
diff --git a/extern/bFTGL/src/Makefile b/extern/bFTGL/src/Makefile index 064480fbd16..3fa3e9139ab 100644 --- a/extern/bFTGL/src/Makefile +++ b/extern/bFTGL/src/Makefile @@ -46,6 +46,7 @@ CCSRCS = FTBitmapGlyph.cpp FTCharmap.cpp FTContour.cpp FTExtrdGlyph.cpp \ include nan_compile.mk CPPFLAGS += -I../include +CPPFLAGS += -I/usr/X11R6/include CPPFLAGS += -I$(NAN_FREETYPE)/include -I$(NAN_FREETYPE)/include/freetype2 install: all debug diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp b/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp index aa0beab7786..1fb23b40752 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp +++ b/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp @@ -33,11 +33,15 @@ #include <string.h> #include <stdio.h> -#ifdef WIN32 +#if defined (WIN32) #include <malloc.h> #else +#if defined (__FreeBSD__) +#include <stdlib.h> +#else #include <alloca.h> #endif +#endif class BU_Joint; diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp b/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp index ea9240c2bcf..311fd8b5eed 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp +++ b/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp @@ -39,11 +39,15 @@ #include <string.h> #include <stdio.h> -#ifdef WIN32 +#if defined (WIN32) #include <malloc.h> #else +#if defined (__FreeBSD__) +#include <stdlib.h> +#else #include <alloca.h> #endif +#endif #include "Dynamics/BU_Joint.h" #include "ContactSolverInfo.h" @@ -838,4 +842,4 @@ void SolveInternal1 (float global_cfm, } -#endif //USE_SOR_SOLVER
\ No newline at end of file +#endif //USE_SOR_SOLVER |