fix autotools/autoconf see also

http://bulletphysics.org/Bullet/phpBB3/viewtopic.php?f=9&t=8300&p=28416#p28416
This commit is contained in:
erwin.coumans
2012-07-31 04:40:16 +00:00
parent 10ed7bffd5
commit a734e86453
2 changed files with 53 additions and 38 deletions

View File

@@ -30,6 +30,7 @@ case "$host" in
PLATFORM_STRING="Linux" PLATFORM_STRING="Linux"
;; ;;
*-*-darwin*) *-*-darwin*)
AC_MSG_WARN([Hello])
AC_DEFINE(PLATFORM_APPLE, 1, [Platform is Apple]) AC_DEFINE(PLATFORM_APPLE, 1, [Platform is Apple])
opengl_LIBS="-framework AGL -framework OpenGL -framework GLUT" opengl_LIBS="-framework AGL -framework OpenGL -framework GLUT"
PLATFORM_STRING="Apple" PLATFORM_STRING="Apple"
@@ -52,6 +53,7 @@ case "$host" in
ARCH_STRING="X86-64" ARCH_STRING="X86-64"
;; ;;
ppc-* | powerpc-*) ppc-* | powerpc-*)
AC_MSG_WARN([HI THERE!])
AC_DEFINE(ARCH_PPC, 1, [Architecture is PowerPC]) AC_DEFINE(ARCH_PPC, 1, [Architecture is PowerPC])
ARCH_SPECIFIC_CFLAGS="" ARCH_SPECIFIC_CFLAGS=""
ARCH_STRING="PowerPC" ARCH_STRING="PowerPC"
@@ -87,12 +89,18 @@ AC_ARG_ENABLE([demos],
AM_CONDITIONAL([CONDITIONAL_BUILD_DEMOS], [false]) AM_CONDITIONAL([CONDITIONAL_BUILD_DEMOS], [false])
dnl Check for OpenGL and GLUT dnl Check for OpenGL and GLUT
if test "x$drawstuff" = "xOSX"; then
case "$host" in
*-*-darwin*)
AC_DEFINE([HAVE_APPLE_OPENGL_FRAMEWORK], [1], AC_DEFINE([HAVE_APPLE_OPENGL_FRAMEWORK], [1],
[Use the Apple OpenGL framework.]) [Use the Apple OpenGL framework.])
GL_LIBS="-framework GLUT -framework OpenGL -framework Carbon -framework AGL" GL_LIBS="-framework GLUT -framework OpenGL -framework Carbon -framework AGL"
have_glut=yes have_glut=yes
else have_glu=yes
have_gl=yes
;;
*)
have_gl_headers=yes have_gl_headers=yes
AC_CHECK_HEADERS(GL/gl.h GL/glu.h GL/glext.h GL/glut.h, , AC_CHECK_HEADERS(GL/gl.h GL/glu.h GL/glext.h GL/glut.h, ,
[have_gl_headers=no], [have_gl_headers=no],
@@ -124,7 +132,11 @@ else
else else
AC_MSG_NOTICE([Found OpenGL]) AC_MSG_NOTICE([Found OpenGL])
fi fi
fi ;;
esac
AC_SUBST(GL_LIBS) AC_SUBST(GL_LIBS)

View File

@@ -95,6 +95,7 @@ libLinearMath_la_SOURCES = \
LinearMath/btAlignedAllocator.cpp \ LinearMath/btAlignedAllocator.cpp \
LinearMath/btSerializer.cpp \ LinearMath/btSerializer.cpp \
LinearMath/btConvexHull.cpp \ LinearMath/btConvexHull.cpp \
LinearMath/btVector3.cpp \
LinearMath/btConvexHullComputer.cpp \ LinearMath/btConvexHullComputer.cpp \
LinearMath/btHashMap.h \ LinearMath/btHashMap.h \
LinearMath/btConvexHull.h \ LinearMath/btConvexHull.h \
@@ -220,6 +221,7 @@ libBulletCollision_la_SOURCES = \
BulletCollision/NarrowPhaseCollision/btManifoldPoint.h \ BulletCollision/NarrowPhaseCollision/btManifoldPoint.h \
BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h \ BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h \
BulletCollision/CollisionDispatch/btCollisionObject.h \ BulletCollision/CollisionDispatch/btCollisionObject.h \
BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h \
BulletCollision/CollisionDispatch/btGhostObject.h \ BulletCollision/CollisionDispatch/btGhostObject.h \
BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h \ BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h \
BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h \ BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h \
@@ -488,6 +490,7 @@ nobase_bullet_include_HEADERS += \
BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h \ BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h \
BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h \ BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h \
BulletCollision/CollisionDispatch/btCollisionObject.h \ BulletCollision/CollisionDispatch/btCollisionObject.h \
BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h \
BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h \ BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h \
BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h \ BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h \
BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h \ BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h \