updated demos -> ALT + mouse uses Maya-style controls, replaced BMF_Fonts by GLDebugFont
fix debug drawing of btMultiSphereShape added box2d demo added experimental gpu 2d demo
This commit is contained in:
48
configure.ac
48
configure.ac
@@ -9,7 +9,7 @@ AC_PREREQ([2.54])
|
||||
#----------------------------------------------------------------------------
|
||||
AC_INIT(
|
||||
[bullet],
|
||||
[2.74],
|
||||
[2.75],
|
||||
[bullet@erwincoumans.com])
|
||||
AC_CANONICAL_HOST
|
||||
CS_PACKAGEINFO(
|
||||
@@ -131,28 +131,28 @@ CS_CHECK_GLUT
|
||||
#----------------------------------------------------------------------------
|
||||
# Package configuration switches.
|
||||
#----------------------------------------------------------------------------
|
||||
AC_ARG_ENABLE([multithreaded],
|
||||
[AC_HELP_STRING([--enable-multithreaded],
|
||||
[build BulletMultiThreaded (default NO)])],
|
||||
[disable_multithreaded=no], [disable_multithreaded=yes])
|
||||
AC_MSG_CHECKING([BulletMultiThreaded])
|
||||
AS_IF([test "$disable_multithreaded" = yes], [build_multithreaded=no], [build_multithreaded=yes])
|
||||
AC_MSG_RESULT([$build_multithreaded])
|
||||
AM_CONDITIONAL([CONDITIONAL_BUILD_MULTITHREADED], [test "$build_multithreaded" = yes])
|
||||
|
||||
AC_ARG_ENABLE([demos],
|
||||
[AS_HELP_STRING([--disable-demos],
|
||||
[disable Bullet demos])],
|
||||
[],
|
||||
[enable_demos=yes])
|
||||
AM_CONDITIONAL([CONDITIONAL_BUILD_DEMOS], [false])
|
||||
if test "x$enable_demos" != xno; then
|
||||
AC_MSG_NOTICE([Building Bullet demos])
|
||||
AM_CONDITIONAL([CONDITIONAL_BUILD_DEMOS],[true])
|
||||
fi
|
||||
|
||||
|
||||
|
||||
AC_ARG_ENABLE([multithreaded],
|
||||
[AC_HELP_STRING([--enable-multithreaded],
|
||||
[build BulletMultiThreaded (default NO)])],
|
||||
[disable_multithreaded=no], [disable_multithreaded=yes])
|
||||
AC_MSG_CHECKING([BulletMultiThreaded])
|
||||
AS_IF([test "$disable_multithreaded" = yes], [build_multithreaded=no], [build_multithreaded=yes])
|
||||
AC_MSG_RESULT([$build_multithreaded])
|
||||
AM_CONDITIONAL([CONDITIONAL_BUILD_MULTITHREADED], [test "$build_multithreaded" = yes])
|
||||
|
||||
AC_ARG_ENABLE([demos],
|
||||
[AS_HELP_STRING([--disable-demos],
|
||||
[disable Bullet demos])],
|
||||
[],
|
||||
[enable_demos=yes])
|
||||
AM_CONDITIONAL([CONDITIONAL_BUILD_DEMOS], [false])
|
||||
if test "x$enable_demos" != xno; then
|
||||
AC_MSG_NOTICE([Building Bullet demos])
|
||||
AM_CONDITIONAL([CONDITIONAL_BUILD_DEMOS],[true])
|
||||
fi
|
||||
|
||||
|
||||
|
||||
AC_ARG_ENABLE([debug],
|
||||
[AC_HELP_STRING([--enable-debug],
|
||||
[build with debugging information (default NO)])],
|
||||
@@ -171,7 +171,7 @@ CS_OUTPUT_INSTALLDIRS
|
||||
CS_EMIT_PACKAGEINFO
|
||||
|
||||
|
||||
CFLAGS="$ARCH_SPECIFIC_CFLAGS $CFLAGS"
|
||||
CFLAGS="$ARCH_SPECIFIC_CFLAGS $CFLAGS"
|
||||
CXXFLAGS="$ARCH_SPECIFIC_CFLAGS $CXXFLAGS $CFLAGS"
|
||||
#----------------------------------------------------------------------------
|
||||
# Emit generated files.
|
||||
|
||||
Reference in New Issue
Block a user