- include path and file changes for FreeBSD
authorHans Lambermont <hans@lambermont.dyndns.org>
Tue, 27 Dec 2005 20:37:15 +0000 (20:37 +0000)
committerHans Lambermont <hans@lambermont.dyndns.org>
Tue, 27 Dec 2005 20:37:15 +0000 (20:37 +0000)
extern/bFTGL/src/Makefile
extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp
extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp

index 064480fbd16be74bf9a02e4c30e8cbdbc1501341..3fa3e9139ab0fa0e60da5e16a2bb894c09547656 100644 (file)
@@ -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
index aa0beab778603a1e4d6638dc238fc321a885c1cc..1fb23b407520679ee0fd8cbd3e24f35fb539c120 100644 (file)
 #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;
 
index ea9240c2bcfd26a7d93d02b17b41fe0f982ede80..311fd8b5eed6b76148030fae3a1065bd4884e66b 100644 (file)
 #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