Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove calls to AC_PROG_CC and AC_PROG_CXX from CS_PROG_CC and CS_PROG_CXX because we call those functions earlier.

Browse Source
This commit is contained in:
john.mccutchan
2009-12-03 16:52:41 +00:00
parent 59fa35fcd6
commit 385c16e309
4 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acinclude.m4
View File

@@ -1416,7 +1416,6 @@ AC_DEFUN([CS_CHECK_TEMPLATE_TOOLKIT2],
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
AC_DEFUN([CS_PROG_CC],[ AC_DEFUN([CS_PROG_CC],[
CFLAGS="$CFLAGS" # Filter undesired flags CFLAGS="$CFLAGS" # Filter undesired flags
AC_PROG_CC
AS_IF([test -n "$CC"],[ AS_IF([test -n "$CC"],[
CS_EMIT_BUILD_PROPERTY([CMD.CC], [$CC]) CS_EMIT_BUILD_PROPERTY([CMD.CC], [$CC])
CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS], [$CPPFLAGS $CFLAGS], [+]) CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS], [$CPPFLAGS $CFLAGS], [+])
@@ -1429,7 +1428,6 @@ AC_DEFUN([CS_PROG_CC],[
AC_DEFUN([CS_PROG_CXX],[ AC_DEFUN([CS_PROG_CXX],[
CXXFLAGS="$CXXFLAGS" # Filter undesired flags CXXFLAGS="$CXXFLAGS" # Filter undesired flags
AC_PROG_CXX
AS_IF([test -n "$CXX"],[ AS_IF([test -n "$CXX"],[
CS_EMIT_BUILD_PROPERTY([CMD.C++], [$CXX]) CS_EMIT_BUILD_PROPERTY([CMD.C++], [$CXX])

5
config.h.in
View File

@@ -60,9 +60,8 @@
/* Define to 1 if you have the <windows.h> header file. */ /* Define to 1 if you have the <windows.h> header file. */
#undef HAVE_WINDOWS_H #undef HAVE_WINDOWS_H
/* Define to the sub-directory in which libtool stores uninstalled libraries. /* Define to 1 if your C compiler doesn't accept -c and -o together. */
*/ #undef NO_MINUS_C_MINUS_O
#undef LT_OBJDIR
/* Name of package */ /* Name of package */
#undef PACKAGE #undef PACKAGE

2
configure.ac
View File

@@ -18,7 +18,7 @@ CS_PACKAGEINFO(
[http://www.bulletphysics.com]) [http://www.bulletphysics.com])
AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_SRCDIR([configure.ac])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AC_PROG_CC AM_PROG_CC_C_O
AC_PROG_CXX AC_PROG_CXX
AC_PROG_LIBTOOL AC_PROG_LIBTOOL

2
src/Makefile.am
View File

@@ -318,7 +318,7 @@ libbulletdynamics_la_SOURCES = \
BulletDynamics/Vehicle/btRaycastVehicle.cpp \ BulletDynamics/Vehicle/btRaycastVehicle.cpp \
BulletDynamics/Character/btKinematicCharacterController.cpp \ BulletDynamics/Character/btKinematicCharacterController.cpp \
BulletDynamics/Character/btKinematicCharacterController.h \ BulletDynamics/Character/btKinematicCharacterController.h \
BulletDynamics/Character/btCharacterControllerInterface.h \ BulletDynamics/Character/btCharacterControllerInterface.h \
BulletDynamics/Dynamics/btActionInterface.h \ BulletDynamics/Dynamics/btActionInterface.h \
BulletDynamics/Dynamics/btContinuousDynamicsWorld.h \ BulletDynamics/Dynamics/btContinuousDynamicsWorld.h \
BulletDynamics/Dynamics/btSimpleDynamicsWorld.h \ BulletDynamics/Dynamics/btSimpleDynamicsWorld.h \