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

updated autotools support for make, while keeping jam support. other options are cmake and msvc builds.

Browse Source
This commit is contained in:
ejcoumans
2006-12-17 05:35:41 +00:00
parent c1e0f4085e
commit 818b672f60
6 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Demos/BasicDemo/Makefile.am Normal file
View File

@@ -0,0 +1,5 @@
bin_PROGRAMS=BasicDemo
BasicDemo_SOURCES=BasicDemo.cpp BasicDemo.h
BasicDemo_CXXFLAGS=-I@top_builddir@src -I@top_builddir@Demos/OpenGL
BasicDemo_LDADD=-L../OpenGL -lbulletopenglsupport -L../../src -lbulletdynamics -lbulletcollision -lbulletmath @opengl_LIBS@

5
Demos/CcdPhysicsDemo/Makefile.am Normal file
View File

@@ -0,0 +1,5 @@
bin_PROGRAMS=CcdPhysicsDemo
CcdPhysicsDemo_SOURCES=CcdPhysicsDemo.cpp CcdPhysicsDemo.h
CcdPhysicsDemo_CXXFLAGS=-I@top_builddir@src -I@top_builddir@Demos/OpenGL
CcdPhysicsDemo_LDADD=-L../OpenGL -lbulletopenglsupport -L../../src -lbulletdynamics -lbulletcollision -lbulletmath @opengl_LIBS@

5
Demos/VehicleDemo/Makefile.am Normal file
View File

@@ -0,0 +1,5 @@
bin_PROGRAMS=VehicleDemo
VehicleDemo_SOURCES=VehicleDemo.cpp VehicleDemo.h
VehicleDemo_CXXFLAGS=-I@top_builddir@src -I@top_builddir@Demos/OpenGL
VehicleDemo_LDADD=-L../OpenGL -lbulletopenglsupport -L../../src -lbulletdynamics -lbulletcollision -lbulletmath @opengl_LIBS@

2
Makefile.am
View File

@@ -1 +1 @@
SUBDIRS=src Demos/OpenGL
SUBDIRS=src Demos/OpenGL Demos/BasicDemo Demos/VehicleDemo Demos/CcdPhysicsDemo

1
autogen.sh
View File

@@ -1,5 +1,4 @@
#! /bin/sh
set -x
if test ! -f configure.ac ; then
echo "*** Please invoke this script from directory containing configure.ac."

40
configure.ac
View File

@@ -80,7 +80,42 @@ AS_IF([test $cs_host_family = windows],
CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS], [$glut_cflags], [+])
CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS], [$glut_lflags], [+])
])
CS_CHECK_GLUT
#----------------------------------------------------------------------------
# check for OpenGL related libraries
#----------------------------------------------------------------------------
case "${host}" in
*darwin*|*macosx*)
opengl_LIBS="$LIBS -framework Carbon -framework OpenGL -framework IOKit -framework AGL"
;;
*-*-cygwin* | *-*-mingw32*)
dnl CygWin under Windoze.
echo Win32 specific hacks...
AC_DEFINE([WIN32], 1, [Define for Win32 platforms])
AC_DEFINE([NOMINMAX], 1, [Define for Win32 platforms])
opengl_LIBS="-lglut32 -lglu32 -lopengl32 -luser32 -lgdi32 -lm -lwinmm"
joystick_LIBS="$joystick_LIBS -lwinmm"
echo "Will link apps with $LIBS"
;;
*)
dnl X-Windows based machines
save_LIBS=$LIBS
AC_SEARCH_LIBS(glNewList, [ GL GLcore MesaGL ])
AC_SEARCH_LIBS(glutInit, [ glut ])
opengl_LIBS="$LIBS"
LIBS=$save_LIBS
if test "x$ac_cv_search_glNewList" = "x-lGLcore"; then
dnl if GLcore found, then also check for GL
AC_SEARCH_LIBS(glXCreateContext, GL)
fi
AC_SUBST(opengl_LIBS,[$opengl_LIBS])
esac
#----------------------------------------------------------------------------
# Package configuration switches.
@@ -106,7 +141,8 @@ CS_EMIT_PACKAGEINFO
# Emit generated files.
#----------------------------------------------------------------------------
CS_JAMCONFIG_OUTPUT([Jamconfig])
AC_CONFIG_FILES([Jamfile bullet.pc Makefile src/Makefile Demos/OpenGL/Makefile])
AC_CONFIG_FILES([Jamfile bullet.pc Makefile src/Makefile Demos/OpenGL/Makefile Demos/BasicDemo/Makefile Demos/VehicleDemo/Makefile Demos/CcdPhysicsDemo/Makefile])
AC_OUTPUT
AC_MSG_NOTICE([