From d6e4c4e7c2b1e28961f1dfe2f25ef96ced60b21b Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 17 Oct 2010 17:19:03 +0000 Subject: core bullet physics support, initial vstrafe support --- configure.in | 46 ++++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 26 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index a64eed2..0b32047 100644 --- a/configure.in +++ b/configure.in @@ -240,39 +240,33 @@ AC_ARG_WITH(bullet, ) ) -dnl disable bullet for now -with_bullet=no +save_CPPFLAGS="$CPPFLAGS" +save_LDFLAGS="$LDFLAGS" -if test "x${with_bullet}" != "xno"; then - save_CPPFLAGS="$CPPFLAGS" - save_LDFLAGS="$LDFLAGS" +AC_MSG_CHECKING(for bullet directory) - AC_MSG_CHECKING(for bullet directory) +BULLET_DIR="/usr/local" +if test "x${with_bullet}" != "x"; then + BULLET_DIR="${with_bullet}" +fi +AC_MSG_RESULT([$BULLET_DIR]) - BULLET_DIR="/usr/local" - if test "x${with_bullet}" != "x"; then - BULLET_DIR="${with_bullet}" - fi - AC_MSG_RESULT([$BULLET_DIR]) +BULLET_CFLAGS="-I${BULLET_DIR}/include/bullet" +BULLET_LIBS="-L${BULLET_DIR}/lib" - BULLET_CFLAGS="-I${BULLET_DIR}/include/bullet" - BULLET_LIBS="-L${BULLET_DIR}/lib" +CPPFLAGS="$save_CPPFLAGS $BULLET_CFLAGS" +LDFLAGS="$save_LDFLAGS $BULLET_LIBS" - CPPFLAGS="$save_CPPFLAGS $BULLET_CFLAGS" - LDFLAGS="$save_LDFLAGS $BULLET_LIBS" +AC_CHECK_HEADER(btBulletDynamicsCommon.h, + AC_DEFINE(HAVE_BULLET, yes, [Define this if you have the bullet physics library]) + BULLET_LIBS="$BULLET_LIBS -lLinearMath -lBulletDynamics -lBulletCollision" + HAVE_BULLET="yes", + AC_MSG_ERROR([bullet physics library not found (http://bulletphysics.org)]) +) - AC_CHECK_HEADER(btBulletDynamicsCommon.h, - AC_DEFINE(HAVE_BULLET, yes, [Define this if you have the bullet physics library]) - BULLET_LIBS="$BULLET_LIBS -lbulletmath -lbulletdynamics -lbulletcollision" - HAVE_BULLET="yes", - BULLET_LIBS="" - BULLET_CFLAGS="" - HAVE_BULLET="no" - ) +CPPFLAGS="$save_CPPFLAGS" +LDFLAGS="$save_LDFLAGS" - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" -fi AC_SUBST(BULLET_CFLAGS) AC_SUBST(BULLET_LIBS) -- cgit v1.2.3