Bumped version in configure.ac to 1.5.6 (assuming that "1.5f" is

the next version released). Updated files in mk/autoconf and mk/jam with copies from CS; fixes a GLU detection issue on MinGW. Set msvc/bullet_ico.ico as the default application icon. Disabled exceptions for gcc builds.
2006-06-17 18:17:17 +00:00
parent 51a645bb4a
commit 495349f97d
66 changed files with 14471 additions and 14337 deletions
--- a/Jamfile.in
+++ b/Jamfile.in
@@ -1,64 +1,66 @@
-TOP ?= "@top_srcdir@" ;
-BUILDTOP ?= "@top_builddir@" ;
-
-SubDir TOP ;
-
-IncludeDir ;
-IncludeDir Bullet ;
-IncludeDir BulletDynamics ;
-IncludeDir LinearMath ;
-
-IncludeDir $(BUILDTOP) : : literal transient ;
-
-CleanDir clean :
-    out ;
-Clean distclean :
-    aclocal.m4
-    config.h
-    config.h.in~
-    config.log
-    config.status
-    config.status.lineno
-    config.cache
-    configure.lineno
-    Jamconfig
-    Jamfile ;
-CleanDir distclean :
-    autom4te.cache ;
-Depends distclean : clean ;
-
-Clean maintainerclean :
-  config.h.in
-  configure ;
-Depends maintainerclean : distclean ;
-
-Help distclean : "Remove built targets and configuration" ;
-Help maintainerclean :
-    "Remove built targets, configuration, and generated files." ;
-
-MsvcGenSubDir TOP msvc : common ;
-MsvcGenSubDir TOP msvc 6 : 6 ;
-MsvcGenSubDir TOP msvc 7 : 7 ;
-MsvcGenSubDir TOP msvc 71 : 71 ;
-MsvcGenSubDir TOP msvc 8 : 8 ;
-MsvcGenTemplateDir TOP mk msvcgen ;
-MsvcGenWorkspace bullet ;
-
-# Set project-specific compiler and linker options for msvcgen.
-MsvcGenConfig GL.AVAILABLE : yes ;
-MsvcGenConfig GL.LFLAGS :  ;
-MsvcGenConfig GL.LIBS : opengl32.lib ;
-MsvcGenConfig GLUT.AVAILABLE : yes ;
-MsvcGenConfig GLUT.CFLAGS : ;
-MsvcGenConfig GLUT.LFLAGS : ;
-MsvcGenConfig GLUT.INCDIRS : "../../Glut" ;
-MsvcGenConfig GLUT.LIBDIRS : "../../Glut" ;
-MsvcGenConfig GLUT.LIBS : glut32.lib ;
-
-SubInclude TOP LinearMath ;
-SubInclude TOP Bullet ;
-SubInclude TOP BulletDynamics ;
-SubInclude TOP Extras ;
-SubInclude TOP Demos ;
-
-Depends install_config : [ DoInstall bullet.pc : $(libdir)/pkgconfig ] ;
+TOP ?= "@top_srcdir@" ;
+BUILDTOP ?= "@top_builddir@" ;
+
+SubDir TOP ;
+
+IncludeDir ;
+IncludeDir Bullet ;
+IncludeDir BulletDynamics ;
+IncludeDir LinearMath ;
+
+IncludeDir $(BUILDTOP) : : literal transient ;
+
+CleanDir clean :
+    out ;
+Clean distclean :
+    aclocal.m4
+    config.h
+    config.h.in~
+    config.log
+    config.status
+    config.status.lineno
+    config.cache
+    configure.lineno
+    Jamconfig
+    Jamfile ;
+CleanDir distclean :
+    autom4te.cache ;
+Depends distclean : clean ;
+
+Clean maintainerclean :
+  config.h.in
+  configure ;
+Depends maintainerclean : distclean ;
+
+Help distclean : "Remove built targets and configuration" ;
+Help maintainerclean :
+    "Remove built targets, configuration, and generated files." ;
+
+ApplicationIconDefault win32 : all : bullet_ico.ico : $(TOP) msvc ;
+
+MsvcGenSubDir TOP msvc : common ;
+MsvcGenSubDir TOP msvc 6 : 6 ;
+MsvcGenSubDir TOP msvc 7 : 7 ;
+MsvcGenSubDir TOP msvc 71 : 71 ;
+MsvcGenSubDir TOP msvc 8 : 8 ;
+MsvcGenTemplateDir TOP mk msvcgen ;
+MsvcGenWorkspace bullet ;
+
+# Set project-specific compiler and linker options for msvcgen.
+MsvcGenConfig GL.AVAILABLE : yes ;
+MsvcGenConfig GL.LFLAGS :  ;
+MsvcGenConfig GL.LIBS : opengl32.lib ;
+MsvcGenConfig GLUT.AVAILABLE : yes ;
+MsvcGenConfig GLUT.CFLAGS : ;
+MsvcGenConfig GLUT.LFLAGS : ;
+MsvcGenConfig GLUT.INCDIRS : "../../Glut" ;
+MsvcGenConfig GLUT.LIBDIRS : "../../Glut" ;
+MsvcGenConfig GLUT.LIBS : glut32.lib ;
+
+SubInclude TOP LinearMath ;
+SubInclude TOP Bullet ;
+SubInclude TOP BulletDynamics ;
+SubInclude TOP Extras ;
+SubInclude TOP Demos ;
+
+Depends install_config : [ DoInstall bullet.pc : $(libdir)/pkgconfig ] ;