Regenerated configure & VC projects.

Misc property fixes.

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for bullet 1.1.2006.0319.
+# Generated by GNU Autoconf 2.59 for bullet 1.5.6.
 #
 # Report bugs to <bullet@erwincoumans.com>.
 #
@@ -271,8 +271,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='bullet'
 PACKAGE_TARNAME='bullet'
-PACKAGE_VERSION='1.1.2006.0319'
+PACKAGE_VERSION='1.5.6'
-PACKAGE_STRING='bullet 1.1.2006.0319'
+PACKAGE_STRING='bullet 1.5.6'
 PACKAGE_BUGREPORT='bullet@erwincoumans.com'
 
 ac_unique_file="mk/jam/build.jam"
@@ -313,7 +313,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP WINDRES ac_ct_WINDRES STRINGS ac_ct_STRINGS LIBTOOL_TEST ac_ct_LIBTOOL_TEST LIBTOOL_PATH LIBTOOL ac_ct_LIBTOOL CS_LT_APPLE APPLE_LIBTOOL MKDIR MKDIRS INSTALL DOXYGEN DOT ac_ct_DOT PERL TTREE CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS EGREP LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP WINDRES ac_ct_WINDRES STRINGS ac_ct_STRINGS OBJCOPY ac_ct_OBJCOPY LIBTOOL_TEST ac_ct_LIBTOOL_TEST LIBTOOL_PATH LIBTOOL ac_ct_LIBTOOL CS_LT_APPLE APPLE_LIBTOOL MKDIR MKDIRS INSTALL DOXYGEN DOT ac_ct_DOT PERL TTREE CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS EGREP LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -790,7 +790,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures bullet 1.1.2006.0319 to adapt to many kinds of systems.
+\`configure' configures bullet 1.5.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -855,7 +855,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of bullet 1.1.2006.0319:";;
+     short | recursive ) echo "Configuration of bullet 1.5.6:";;
    esac
   cat <<\_ACEOF
 
@@ -980,7 +980,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-bullet configure 1.1.2006.0319
+bullet configure 1.5.6
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -994,7 +994,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by bullet $as_me 1.1.2006.0319, which was
+It was created by bullet $as_me 1.5.6, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -3263,6 +3263,7 @@ echo "$as_me: error: Could not find a usable C++ compiler." >&2;}
 fi
 
 
+
     if test -n "$CXX"; then
   cs_build_prop_val="\$(CMD.C++)"
     cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'`
@@ -3314,7 +3315,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
     cs_build_ok=no
 
 
-    for cs_build_item in `echo @-shared@@ | sed 'y% %#%'`
+    for cs_build_item in `echo @-shared $cs_cv_prog_cxx_pic@@ | sed 'y% %#%'`
     do
 
     set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
@@ -4305,11 +4306,11 @@ fi
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_STRINGS+set}" = set; then
+if test "${ac_cv_prog_OBJCOPY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -n "$STRINGS"; then
+  if test -n "$OBJCOPY"; then
-  ac_cv_prog_STRINGS="$STRINGS" # Let the user override the test.
+  ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -4318,7 +4319,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRINGS="$ac_tool_prefix$ac_prog"
+    ac_cv_prog_OBJCOPY="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -4327,31 +4328,31 @@ done
 
 fi
 fi
-STRINGS=$ac_cv_prog_STRINGS
+OBJCOPY=$ac_cv_prog_OBJCOPY
-if test -n "$STRINGS"; then
+if test -n "$OBJCOPY"; then
-  echo "$as_me:$LINENO: result: $STRINGS" >&5
+  echo "$as_me:$LINENO: result: $OBJCOPY" >&5
-echo "${ECHO_T}$STRINGS" >&6
+echo "${ECHO_T}$OBJCOPY" >&6
 else
   echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-    test -n "$STRINGS" && break
+    test -n "$OBJCOPY" && break
   done
 fi
-if test -z "$STRINGS"; then
+if test -z "$OBJCOPY"; then
-  ac_ct_STRINGS=$STRINGS
+  ac_ct_OBJCOPY=$OBJCOPY
   for ac_prog in objcopy
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_STRINGS+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -n "$ac_ct_STRINGS"; then
+  if test -n "$ac_ct_OBJCOPY"; then
-  ac_cv_prog_ac_ct_STRINGS="$ac_ct_STRINGS" # Let the user override the test.
+  ac_cv_prog_ac_ct_OBJCOPY="$ac_ct_OBJCOPY" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -4360,7 +4361,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRINGS="$ac_prog"
+    ac_cv_prog_ac_ct_OBJCOPY="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -4369,19 +4370,19 @@ done
 
 fi
 fi
-ac_ct_STRINGS=$ac_cv_prog_ac_ct_STRINGS
+ac_ct_OBJCOPY=$ac_cv_prog_ac_ct_OBJCOPY
-if test -n "$ac_ct_STRINGS"; then
+if test -n "$ac_ct_OBJCOPY"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRINGS" >&5
+  echo "$as_me:$LINENO: result: $ac_ct_OBJCOPY" >&5
-echo "${ECHO_T}$ac_ct_STRINGS" >&6
+echo "${ECHO_T}$ac_ct_OBJCOPY" >&6
 else
   echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-  test -n "$ac_ct_STRINGS" && break
+  test -n "$ac_ct_OBJCOPY" && break
 done
 
-  STRINGS=$ac_ct_STRINGS
+  OBJCOPY=$ac_ct_OBJCOPY
 fi
 
     cs_build_prop_val="$OBJCOPY"
@@ -5241,6 +5242,180 @@ fi
 fi
 
 
+#----------------------------------------------------------------------------
+# Check if C++ exceptions can be disabled.
+#----------------------------------------------------------------------------
+echo "$as_me:$LINENO: checking how to disable C++ exceptions" >&5
+echo $ECHO_N "checking how to disable C++ exceptions... $ECHO_C" >&6
+if test "${cs_cv_prog_cxx_disable_exceptions_ok+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+    cs_cflags_save="$CXXFLAGS"
+    cs_lflags_save="$LDFLAGS"
+    cs_libs_save="$LIBS"
+    cs_build_ok=no
+
+
+    for cs_build_item in `echo @-fno-exceptions@@ | sed 'y% %#%'`
+    do
+
+    set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
+	{ for (i=1; i <= NF; ++i)
+	    { if ($i == "") print "filler"; else print $i } }'`
+    shift
+    if test $# -eq 0; then
+  cs_dummy=''
+else
+  if test "$1" = filler; then
+  cs_dummy=''
+else
+  cs_dummy=$1
+fi
+
+	shift
+fi
+if test $# -eq 0; then
+  cs_cflags_test=''
+else
+  if test "$1" = filler; then
+  cs_cflags_test=''
+else
+  cs_cflags_test=$1
+fi
+
+	shift
+fi
+if test $# -eq 0; then
+  cs_lflags_test=''
+else
+  if test "$1" = filler; then
+  cs_lflags_test=''
+else
+  cs_lflags_test=$1
+fi
+
+	shift
+fi
+if test $# -eq 0; then
+  cs_libs_test=''
+else
+  if test "$1" = filler; then
+  cs_libs_test=''
+else
+  cs_libs_test=$1
+fi
+
+	shift
+fi
+
+    cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
+    cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
+    cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
+
+	CXXFLAGS="$cs_cflags_test  $cs_cflags_save"
+	LDFLAGS="$cs_lflags_test  $cs_lflags_save"
+	LIBS="$cs_libs_test  $cs_libs_save"
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cs_build_ok=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+	if test $cs_build_ok = yes; then
+  break
+fi
+
+    done
+
+
+    CXXFLAGS=$cs_cflags_save
+    LDFLAGS=$cs_lflags_save
+    LIBS=$cs_libs_save
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+    if test $cs_build_ok = yes; then
+  cs_build_cflags=`echo x$cs_cflags_test | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'`
+	cs_build_lflags=`echo x$cs_lflags_test | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'`
+	cs_build_libs=`echo x$cs_libs_test | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'`
+	cs_cv_prog_cxx_disable_exceptions=`echo x$cs_build_cflags $cs_build_lflags $cs_build_libs | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'`
+	    cs_cv_prog_cxx_disable_exceptions_ok="$cs_cv_prog_cxx_disable_exceptions"
+else
+  cs_cv_prog_cxx_disable_exceptions=''
+	    cs_cv_prog_cxx_disable_exceptions_ok=no
+fi
+
+fi
+echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_disable_exceptions_ok" >&5
+echo "${ECHO_T}$cs_cv_prog_cxx_disable_exceptions_ok" >&6
+    if test "$cs_cv_prog_cxx_disable_exceptions_ok" != no; then
+  cs_build_prop_val="$cs_cv_prog_cxx_disable_exceptions"
+    cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'`
+    if test -n "$cs_build_prop_val"; then
+  cs_jamconfig_text="${cs_jamconfig_text}COMPILER.C++FLAGS.EXCEPTIONS.DISABLE ?= \"$cs_build_prop_val\" ;
+"
+fi
+
+	    cs_build_prop_val="$cs_cv_prog_cxx_disable_exceptions"
+    cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'`
+    if test -n "$cs_build_prop_val"; then
+  cs_jamconfig_text="${cs_jamconfig_text}COMPILER.C++FLAGS += \"$cs_build_prop_val\" ;
+"
+fi
+
+fi
+
+
+
 #----------------------------------------------------------------------------
 # Determine system type
 #----------------------------------------------------------------------------
@@ -8855,7 +9030,7 @@ fi
 
 	# Windows?
 	if test $cs_host_family = windows; then
-  cs_win32_gl=`echo @@@-lopengl32 | sed 'y% %#%'`
+  cs_win32_glu=`echo @@@-lglu32 | sed 'y% %#%'`
 fi
 
 
@@ -9723,7 +9898,7 @@ cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_NAME ?= \"$PACKAGE_NAME\" ;
 "
     cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_COPYRIGHT ?= \"$PACKAGE_COPYRIGHT\" ;
 "
-    for cs_veritem in 1 1 2006 0319; do
+    for cs_veritem in 1 5 6; do
 	cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_VERSION_LIST += \"$cs_veritem\" ;
 "
     done
@@ -10100,7 +10275,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by bullet $as_me 1.1.2006.0319, which was
+This file was extended by bullet $as_me 1.5.6, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10163,7 +10338,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-bullet config.status 1.1.2006.0319
+bullet config.status 1.5.6
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -10426,6 +10601,8 @@ s,@WINDRES@,$WINDRES,;t t
 s,@ac_ct_WINDRES@,$ac_ct_WINDRES,;t t
 s,@STRINGS@,$STRINGS,;t t
 s,@ac_ct_STRINGS@,$ac_ct_STRINGS,;t t
+s,@OBJCOPY@,$OBJCOPY,;t t
+s,@ac_ct_OBJCOPY@,$ac_ct_OBJCOPY,;t t
 s,@LIBTOOL_TEST@,$LIBTOOL_TEST,;t t
 s,@ac_ct_LIBTOOL_TEST@,$ac_ct_LIBTOOL_TEST,;t t
 s,@LIBTOOL_PATH@,$LIBTOOL_PATH,;t t

msvc/6/libbulletdynamics.dsp

@@ -108,6 +108,10 @@ SOURCE=..\..\BulletDynamics\ConstraintSolver\ContactConstraint.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\BulletDynamics\ConstraintSolver\Generic6DofConstraint.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\BulletDynamics\ConstraintSolver\HingeConstraint.cpp
 # End Source File
 # Begin Source File
@@ -164,6 +168,10 @@ SOURCE=..\..\BulletDynamics\ConstraintSolver\ContactSolverInfo.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\BulletDynamics\ConstraintSolver\Generic6DofConstraint.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\BulletDynamics\ConstraintSolver\HingeConstraint.h
 # End Source File
 # Begin Source File

msvc/7/libbulletdynamics.vcproj

@@ -162,6 +162,9 @@
 			<File
 				RelativePath="..\..\BulletDynamics\ConstraintSolver\ContactConstraint.cpp">
 			</File>
+			<File
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\Generic6DofConstraint.cpp">
+			</File>
 			<File
 				RelativePath="..\..\BulletDynamics\ConstraintSolver\HingeConstraint.cpp">
 			</File>
@@ -205,6 +208,9 @@
 			<File
 				RelativePath="..\..\BulletDynamics\ConstraintSolver\ContactSolverInfo.h">
 			</File>
+			<File
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\Generic6DofConstraint.h">
+			</File>
 			<File
 				RelativePath="..\..\BulletDynamics\ConstraintSolver\HingeConstraint.h">
 			</File>

msvc/71/appColladaDemo.vcproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding = "Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
@@ -16,23 +16,23 @@
 			OutputDirectory="..\..\out\release71\build\appColladaDemo\"
 			IntermediateDirectory="..\..\out\release71\build\appColladaDemo\"
 			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
+			WholeProgramOptimization="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions=" "
 				Optimization="2"
-				OptimizeForProcessor="1"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Extras\FCollada;..\..\Extras\FCollada\LibXML\include"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32"
 				StringPooling="TRUE"
-				ExceptionHandling="FALSE"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="FALSE"
 				EnableFunctionLevelLinking="TRUE"
-				TreatWChar_tAsBuiltInType="FALSE"
+				RuntimeLibrary="2"
+				DebugInformationFormat="3"
+				BufferSecurityCheck="FALSE"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release71\build\appColladaDemo\appColladaDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appColladaDemo\"
 				ObjectFile="..\..\out\release71\build\appColladaDemo\"
@@ -40,26 +40,29 @@
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"
+				TreatWChar_tAsBuiltInType="false"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				IgnoreImportLibrary="TRUE"
-				AdditionalOptions=" "
-				AdditionalDependencies="glut32.lib"
-				OutputFile="..\..\ColladaDemo.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\Glut"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\out\release71\build\appColladaDemo\ColladaDemo.pdb"
-				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
+				OutputFile="..\..\ColladaDemo.exe"
+				SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\release71\build\appColladaDemo\ColladaDemo.pdb"
 				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE"
@@ -68,7 +71,8 @@
 				TargetEnvironment="1"
 				TypeLibraryName="..\..\out\release71\build\appColladaDemo\appColladaDemo.tlb"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+				/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -76,39 +80,33 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				Culture="1033"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"/>
+				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\..\out\debug71\build\appColladaDemo\"
 			IntermediateDirectory="..\..\out\debug71\build\appColladaDemo\"
 			ConfigurationType="1"
+			CharacterSet="2"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions=" "
 				Optimization="0"
-				OptimizeForProcessor="1"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Extras\FCollada;..\..\Extras\FCollada\LibXML\include"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32"
 				MinimalRebuild="TRUE"
-				ExceptionHandling="FALSE"
+				DebugInformationFormat="4"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="FALSE"
 				RuntimeTypeInfo="TRUE"
+				RuntimeLibrary="3"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appColladaDemo\appColladaDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appColladaDemo\"
 				ObjectFile="..\..\out\debug71\build\appColladaDemo\"
@@ -116,24 +114,27 @@
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"
+				TreatWChar_tAsBuiltInType="false"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
+				OutputFile="..\..\ColladaDemo.exe"
+				SubSystem="1"
 				AdditionalOptions=" "
 				AdditionalDependencies="glut32.lib"
-				OutputFile="..\..\ColladaDemo.exe"
+				IgnoreImportLibrary="TRUE"
-				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\Glut"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
-				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="..\..\out\debug71\build\appColladaDemo\ColladaDemo.pdb"
-				SubSystem="1"
 				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE"
@@ -142,7 +143,8 @@
 				TargetEnvironment="1"
 				TypeLibraryName="..\..\out\debug71\build\appColladaDemo\appColladaDemo.tlb"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+				/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -150,22 +152,14 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				Culture="1033"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"/>
+				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<Filter
 			Name="Source Files"

msvc/71/libbulletdynamics.vcproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding = "Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
@@ -20,17 +20,17 @@
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions=" "
 				Optimization="2"
-				OptimizeForProcessor="1"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;WIN32"
 				StringPooling="TRUE"
-				ExceptionHandling="FALSE"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="FALSE"
 				EnableFunctionLevelLinking="TRUE"
-				TreatWChar_tAsBuiltInType="FALSE"
+				RuntimeLibrary="2"
+				DebugInformationFormat="3"
+				BufferSecurityCheck="FALSE"
+				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"
 				PrecompiledHeaderFile="..\..\out\release71\build\libbulletdynamics\libbulletdynamics.pch"
 				AssemblerListingLocation="..\..\out\release71\build\libbulletdynamics\"
 				ObjectFile="..\..\out\release71\build\libbulletdynamics\"
@@ -38,10 +38,24 @@
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"
+				TreatWChar_tAsBuiltInType="false"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
+				AdditionalOptions=" "
+				AdditionalDependencies=""
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				ProgramDatabaseFile="..\..\out\release71\build\libbulletdynamics\bulletdynamics.pdb"
+				TargetMachine="1"/>
 			<Tool
 				Name="VCLibrarianTool"
 				OutputFile="..\..\out\release71\libs\libbulletdynamics.lib"
@@ -54,7 +68,8 @@
 				TargetEnvironment="1"
 				TypeLibraryName="..\..\out\release71\build\libbulletdynamics\libbulletdynamics.tlb"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+				/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -62,16 +77,12 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				Culture="1033"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"/>
+				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
@@ -82,16 +93,16 @@
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions=" "
 				Optimization="0"
-				OptimizeForProcessor="1"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;WIN32"
 				MinimalRebuild="TRUE"
-				ExceptionHandling="FALSE"
+				DebugInformationFormat="4"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="FALSE"
 				RuntimeTypeInfo="TRUE"
+				RuntimeLibrary="3"
+				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"
 				PrecompiledHeaderFile="..\..\out\debug71\build\libbulletdynamics\libbulletdynamics.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\libbulletdynamics\"
 				ObjectFile="..\..\out\debug71\build\libbulletdynamics\"
@@ -99,10 +110,22 @@
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"
+				TreatWChar_tAsBuiltInType="false"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
+				AdditionalOptions=" "
+				AdditionalDependencies=""
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				ProgramDatabaseFile="..\..\out\debug71\build\libbulletdynamics\bulletdynamics.pdb"
+				TargetMachine="1"/>
 			<Tool
 				Name="VCLibrarianTool"
 				OutputFile="..\..\out\debug71\libs\libbulletdynamics_d.lib"
@@ -115,7 +138,8 @@
 				TargetEnvironment="1"
 				TypeLibraryName="..\..\out\debug71\build\libbulletdynamics\libbulletdynamics.tlb"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+				/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -123,32 +147,23 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				Culture="1033"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"/>
+				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
 			Filter="">
-			<File
-				RelativePath="..\..\BulletDynamics\Dynamics\BU_Joint.cpp">
-			</File>
 			<File
 				RelativePath="..\..\BulletDynamics\ConstraintSolver\ContactConstraint.cpp">
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\Dynamics\ContactJoint.cpp">
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\Generic6DofConstraint.cpp">
 			</File>
 			<File
 				RelativePath="..\..\BulletDynamics\ConstraintSolver\HingeConstraint.cpp">
@@ -159,9 +174,6 @@
 			<File
 				RelativePath="..\..\BulletDynamics\ConstraintSolver\Point2PointConstraint.cpp">
 			</File>
-			<File
-				RelativePath="..\..\BulletDynamics\Dynamics\RigidBody.cpp">
-			</File>
 			<File
 				RelativePath="..\..\BulletDynamics\ConstraintSolver\SimpleConstraintSolver.cpp">
 			</File>
@@ -174,13 +186,19 @@
 			<File
 				RelativePath="..\..\BulletDynamics\ConstraintSolver\TypedConstraint.cpp">
 			</File>
+			<File
+				RelativePath="..\..\BulletDynamics\Dynamics\BU_Joint.cpp">
+			</File>
+			<File
+				RelativePath="..\..\BulletDynamics\Dynamics\ContactJoint.cpp">
+			</File>
+			<File
+				RelativePath="..\..\BulletDynamics\Dynamics\RigidBody.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="">
-			<File
-				RelativePath="..\..\BulletDynamics\Dynamics\BU_Joint.h">
-			</File>
 			<File
 				RelativePath="..\..\BulletDynamics\ConstraintSolver\ConstraintSolver.h">
 			</File>
@@ -188,10 +206,10 @@
 				RelativePath="..\..\BulletDynamics\ConstraintSolver\ContactConstraint.h">
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\Dynamics\ContactJoint.h">
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\ContactSolverInfo.h">
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\ContactSolverInfo.h">
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\Generic6DofConstraint.h">
 			</File>
 			<File
 				RelativePath="..\..\BulletDynamics\ConstraintSolver\HingeConstraint.h">
@@ -199,18 +217,12 @@
 			<File
 				RelativePath="..\..\BulletDynamics\ConstraintSolver\JacobianEntry.h">
 			</File>
-			<File
-				RelativePath="..\..\BulletDynamics\Dynamics\MassProps.h">
-			</File>
 			<File
 				RelativePath="..\..\BulletDynamics\ConstraintSolver\OdeConstraintSolver.h">
 			</File>
 			<File
 				RelativePath="..\..\BulletDynamics\ConstraintSolver\Point2PointConstraint.h">
 			</File>
-			<File
-				RelativePath="..\..\BulletDynamics\Dynamics\RigidBody.h">
-			</File>
 			<File
 				RelativePath="..\..\BulletDynamics\ConstraintSolver\SimpleConstraintSolver.h">
 			</File>
@@ -223,13 +235,19 @@
 			<File
 				RelativePath="..\..\BulletDynamics\ConstraintSolver\TypedConstraint.h">
 			</File>
+			<File
+				RelativePath="..\..\BulletDynamics\Dynamics\BU_Joint.h">
+			</File>
+			<File
+				RelativePath="..\..\BulletDynamics\Dynamics\ContactJoint.h">
+			</File>
+			<File
+				RelativePath="..\..\BulletDynamics\Dynamics\MassProps.h">
+			</File>
+			<File
+				RelativePath="..\..\BulletDynamics\Dynamics\RigidBody.h">
+			</File>
 		</Filter>
-		<File
-			RelativePath="..\..\BulletDynamics\ConstraintSolver\Generic6DofConstraint.cpp">
-		</File>
-		<File
-			RelativePath="..\..\BulletDynamics\ConstraintSolver\Generic6DofConstraint.h">
-		</File>
 	</Files>
 	<Globals>
 	</Globals>

msvc/8/appColladaDemo.vcproj

@@ -1,244 +1,178 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding = "Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="appColladaDemo"
 	ProjectGUID="{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}"
-	>
+	SccProjectName=""
+	SccLocalPath="">
 	<Platforms>
 		<Platform
-			Name="Win32"
+			Name="Win32"/>
-		/>
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="..\..\out\release8\build\appColladaDemo\"
 			IntermediateDirectory="..\..\out\release8\build\appColladaDemo\"
 			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
-			>
+			UseOfMFC="0"
-			<Tool
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release8\build\appColladaDemo\appColladaDemo.tlb"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions=" "
 				Optimization="2"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Extras\FCollada;..\..\Extras\FCollada\LibXML\include;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4"
+				StringPooling="TRUE"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32"
+				EnableFunctionLevelLinking="TRUE"
-				StringPooling="true"
-				ExceptionHandling="0"
 				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
+				DebugInformationFormat="3"
-				EnableFunctionLevelLinking="true"
+				BufferSecurityCheck="FALSE"
-				TreatWChar_tAsBuiltInType="false"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release8\build\appColladaDemo\appColladaDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appColladaDemo\"
 				ObjectFile="..\..\out\release8\build\appColladaDemo\"
 				ProgramDataBaseFileName="..\..\out\release8\build\appColladaDemo\ColladaDemo.pdb"
 				WarningLevel="3"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"
+				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"
+				CompileAs="0"/>
-			/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCCustomBuildTool"/>
-			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
+				OutputFile="..\..\ColladaDemo.exe"
+				SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\release8\build\appColladaDemo\ColladaDemo.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\release8\build\appColladaDemo\appColladaDemo.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				Culture="1033"
 				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
-			/>
+				Culture="1033"/>
 			<Tool
-				Name="VCPreLinkEventTool"
+				Name="VCWebServiceProxyGeneratorTool"/>
-			/>
 			<Tool
-				Name="VCLinkerTool"
+				Name="VCWebDeploymentTool"/>
-				IgnoreImportLibrary="true"
-				AdditionalOptions=" "
-				AdditionalDependencies="glut32.lib"
-				OutputFile="..\..\ColladaDemo.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\Glut"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\out\release8\build\appColladaDemo\ColladaDemo.pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\..\out\debug8\build\appColladaDemo\"
 			IntermediateDirectory="..\..\out\debug8\build\appColladaDemo\"
 			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
-			>
+			UseOfMFC="0"
-			<Tool
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug8\build\appColladaDemo\appColladaDemo.tlb"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions=" "
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Extras\FCollada;..\..\Extras\FCollada\LibXML\include;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4"
+				MinimalRebuild="TRUE"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32"
+				DebugInformationFormat="4"
-				MinimalRebuild="true"
+				RuntimeTypeInfo="TRUE"
-				ExceptionHandling="0"
 				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="false"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32"
-				RuntimeTypeInfo="true"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appColladaDemo\appColladaDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appColladaDemo\"
 				ObjectFile="..\..\out\debug8\build\appColladaDemo\"
 				ProgramDataBaseFileName="..\..\out\debug8\build\appColladaDemo\ColladaDemo.pdb"
 				WarningLevel="3"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"
+				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"
+				CompileAs="0"/>
-			/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCCustomBuildTool"/>
-			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
+				OutputFile="..\..\ColladaDemo.exe"
+				SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\debug8\build\appColladaDemo\ColladaDemo.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\debug8\build\appColladaDemo\appColladaDemo.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				Culture="1033"
 				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
-			/>
+				Culture="1033"/>
 			<Tool
-				Name="VCPreLinkEventTool"
+				Name="VCWebServiceProxyGeneratorTool"/>
-			/>
 			<Tool
-				Name="VCLinkerTool"
+				Name="VCWebDeploymentTool"/>
-				IgnoreImportLibrary="true"
-				AdditionalOptions=" "
-				AdditionalDependencies="glut32.lib"
-				OutputFile="..\..\ColladaDemo.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\Glut"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\out\debug8\build\appColladaDemo\ColladaDemo.pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
-			>
+			Filter="">
 			<File
-				RelativePath="..\..\Demos\ColladaDemo\ColladaDemo.cpp"
+				RelativePath="..\..\Demos\ColladaDemo\ColladaDemo.cpp">
-				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			>
+			Filter="">
 			<File
-				RelativePath="..\..\msvc\appColladaDemo.rc"
+				RelativePath="..\..\msvc\appColladaDemo.rc">
-				>
 			</File>
 		</Filter>
 	</Files>

msvc/8/libbulletdynamics.vcproj

@@ -1,18 +1,15 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding = "Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="libbulletdynamics"
 	ProjectGUID="{61BD1097-CF2E-B296-DAA9-73A6FE135319}"
-	RootNamespace="libbulletdynamics"
+	SccProjectName=""
-	>
+	SccLocalPath="">
 	<Platforms>
 		<Platform
-			Name="Win32"
+			Name="Win32"/>
-		/>
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
@@ -20,82 +17,72 @@
 			IntermediateDirectory="..\..\out\release8\build\libbulletdynamics\"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release8\build\libbulletdynamics\libbulletdynamics.tlb"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions=" "
 				Optimization="2"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"
+				StringPooling="TRUE"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;WIN32"
+				EnableFunctionLevelLinking="TRUE"
-				StringPooling="true"
-				ExceptionHandling="0"
 				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
+				DebugInformationFormat="3"
-				EnableFunctionLevelLinking="true"
+				BufferSecurityCheck="FALSE"
-				TreatWChar_tAsBuiltInType="false"
+				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"
 				PrecompiledHeaderFile="..\..\out\release8\build\libbulletdynamics\libbulletdynamics.pch"
 				AssemblerListingLocation="..\..\out\release8\build\libbulletdynamics\"
 				ObjectFile="..\..\out\release8\build\libbulletdynamics\"
 				ProgramDataBaseFileName="..\..\out\release8\build\libbulletdynamics\bulletdynamics.pdb"
 				WarningLevel="3"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"
+				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"
+				CompileAs="0"/>
-			/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCCustomBuildTool"/>
-			/>
 			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCLinkerTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
+				LinkIncremental="1"
-				Culture="1033"
+				OptimizeReferences="2"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"
+				EnableCOMDATFolding="2"
-			/>
+				GenerateDebugInformation="TRUE"
-			<Tool
+				IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
-				Name="VCPreLinkEventTool"
+				AdditionalOptions=" "
-			/>
+				AdditionalDependencies=""
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				ProgramDatabaseFile="..\..\out\release8\build\libbulletdynamics\bulletdynamics.pdb"
+				TargetMachine="1"/>
 			<Tool
 				Name="VCLibrarianTool"
 				OutputFile="..\..\out\release8\libs\libbulletdynamics.lib"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"/>
-			/>
 			<Tool
-				Name="VCALinkTool"
+				Name="VCMIDLTool"
-			/>
+				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS"
-			<Tool
+				MkTypLibCompatible="TRUE"
-				Name="VCXDCMakeTool"
+				SuppressStartupBanner="TRUE"
-			/>
+				TargetEnvironment="1"
-			<Tool
+				TypeLibraryName="..\..\out\release8\build\libbulletdynamics\libbulletdynamics.tlb"/>
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-			/>
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
@@ -103,204 +90,162 @@
 			IntermediateDirectory="..\..\out\debug8\build\libbulletdynamics\"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug8\build\libbulletdynamics\libbulletdynamics.tlb"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions=" "
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"
+				MinimalRebuild="TRUE"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;WIN32"
+				DebugInformationFormat="4"
-				MinimalRebuild="true"
+				RuntimeTypeInfo="TRUE"
-				ExceptionHandling="0"
 				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="false"
+				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;WIN32"
-				RuntimeTypeInfo="true"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"
 				PrecompiledHeaderFile="..\..\out\debug8\build\libbulletdynamics\libbulletdynamics.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\libbulletdynamics\"
 				ObjectFile="..\..\out\debug8\build\libbulletdynamics\"
 				ProgramDataBaseFileName="..\..\out\debug8\build\libbulletdynamics\bulletdynamics.pdb"
 				WarningLevel="3"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"
+				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"
+				CompileAs="0"/>
-			/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCCustomBuildTool"/>
-			/>
 			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCLinkerTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
+				LinkIncremental="2"
-				Culture="1033"
+				GenerateDebugInformation="TRUE"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
-			/>
+				AdditionalOptions=" "
-			<Tool
+				AdditionalDependencies=""
-				Name="VCPreLinkEventTool"
+				IgnoreImportLibrary="TRUE"
-			/>
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				ProgramDatabaseFile="..\..\out\debug8\build\libbulletdynamics\bulletdynamics.pdb"
+				TargetMachine="1"/>
 			<Tool
 				Name="VCLibrarianTool"
 				OutputFile="..\..\out\debug8\libs\libbulletdynamics_d.lib"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"/>
-			/>
 			<Tool
-				Name="VCALinkTool"
+				Name="VCMIDLTool"
-			/>
+				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS"
-			<Tool
+				MkTypLibCompatible="TRUE"
-				Name="VCXDCMakeTool"
+				SuppressStartupBanner="TRUE"
-			/>
+				TargetEnvironment="1"
-			<Tool
+				TypeLibraryName="..\..\out\debug8\build\libbulletdynamics\libbulletdynamics.tlb"/>
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-			/>
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
-			>
+			Filter="">
 			<File
-				RelativePath="..\..\BulletDynamics\Dynamics\BU_Joint.cpp"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\ContactConstraint.cpp">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\ContactConstraint.cpp"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\Generic6DofConstraint.cpp">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\Dynamics\ContactJoint.cpp"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\HingeConstraint.cpp">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\Generic6DofConstraint.cpp"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\OdeConstraintSolver.cpp">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\HingeConstraint.cpp"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\Point2PointConstraint.cpp">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\OdeConstraintSolver.cpp"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\SimpleConstraintSolver.cpp">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\Point2PointConstraint.cpp"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\Solve2LinearConstraint.cpp">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\Dynamics\RigidBody.cpp"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\SorLcp.cpp">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\SimpleConstraintSolver.cpp"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\TypedConstraint.cpp">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\Solve2LinearConstraint.cpp"
+				RelativePath="..\..\BulletDynamics\Dynamics\BU_Joint.cpp">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\SorLcp.cpp"
+				RelativePath="..\..\BulletDynamics\Dynamics\ContactJoint.cpp">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\TypedConstraint.cpp"
+				RelativePath="..\..\BulletDynamics\Dynamics\RigidBody.cpp">
-				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			>
+			Filter="">
 			<File
-				RelativePath="..\..\BulletDynamics\Dynamics\BU_Joint.h"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\ConstraintSolver.h">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\ConstraintSolver.h"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\ContactConstraint.h">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\ContactConstraint.h"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\ContactSolverInfo.h">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\Dynamics\ContactJoint.h"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\Generic6DofConstraint.h">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\ContactSolverInfo.h"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\HingeConstraint.h">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\Generic6DofConstraint.h"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\JacobianEntry.h">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\HingeConstraint.h"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\OdeConstraintSolver.h">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\JacobianEntry.h"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\Point2PointConstraint.h">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\Dynamics\MassProps.h"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\SimpleConstraintSolver.h">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\OdeConstraintSolver.h"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\Solve2LinearConstraint.h">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\Point2PointConstraint.h"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\SorLcp.h">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\Dynamics\RigidBody.h"
+				RelativePath="..\..\BulletDynamics\ConstraintSolver\TypedConstraint.h">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\SimpleConstraintSolver.h"
+				RelativePath="..\..\BulletDynamics\Dynamics\BU_Joint.h">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\Solve2LinearConstraint.h"
+				RelativePath="..\..\BulletDynamics\Dynamics\ContactJoint.h">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\SorLcp.h"
+				RelativePath="..\..\BulletDynamics\Dynamics\MassProps.h">
-				>
 			</File>
 			<File
-				RelativePath="..\..\BulletDynamics\ConstraintSolver\TypedConstraint.h"
+				RelativePath="..\..\BulletDynamics\Dynamics\RigidBody.h">
-				>
 			</File>
 		</Filter>
 	</Files>

msvc/appBasicSample.rc

@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 1, 1, 2006, 0319
+FILEVERSION 1, 5, 6, 0
-PRODUCTVERSION 1, 1, 2006, 0319
+PRODUCTVERSION 1, 5, 6, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "1.1.2006.0319"
+      VALUE "ProductVersion", "1.5.6"
-      VALUE "FileVersion", "1.1.2006.0319"
+      VALUE "FileVersion", "1.5.6"
       VALUE "LegalCopyright", "Copyright (c) 2005-2006 Erwin Coumans"
       VALUE "FileDescription", "BasicSample"
 #ifdef CS_DEBUG
@@ -27,3 +27,4 @@ FILEFLAGS 0x0
     }
   }
 }
+1 ICON "../msvc/bullet_ico.ico"

msvc/appCcdPhysicsDemo.rc

@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 1, 1, 2006, 0319
+FILEVERSION 1, 5, 6, 0
-PRODUCTVERSION 1, 1, 2006, 0319
+PRODUCTVERSION 1, 5, 6, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "1.1.2006.0319"
+      VALUE "ProductVersion", "1.5.6"
-      VALUE "FileVersion", "1.1.2006.0319"
+      VALUE "FileVersion", "1.5.6"
       VALUE "LegalCopyright", "Copyright (c) 2005-2006 Erwin Coumans"
       VALUE "FileDescription", "CcdPhysicsDemo"
 #ifdef CS_DEBUG
@@ -27,5 +27,4 @@ FILEFLAGS 0x0
     }
   }
 }
-APPICON                 ICON                    "bullet_ico.ico"
+1 ICON "../msvc/bullet_ico.ico"
-

msvc/appColladaDemo.rc

@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 1, 1, 2006, 0319
+FILEVERSION 1, 5, 6, 0
-PRODUCTVERSION 1, 1, 2006, 0319
+PRODUCTVERSION 1, 5, 6, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "1.1.2006.0319"
+      VALUE "ProductVersion", "1.5.6"
-      VALUE "FileVersion", "1.1.2006.0319"
+      VALUE "FileVersion", "1.5.6"
       VALUE "LegalCopyright", "Copyright (c) 2005-2006 Erwin Coumans"
       VALUE "FileDescription", "ColladaDemo"
 #ifdef CS_DEBUG
@@ -27,5 +27,4 @@ FILEFLAGS 0x0
     }
   }
 }
-
+1 ICON "../msvc/bullet_ico.ico"
-APPICON                 ICON                    "bullet_ico.ico"

msvc/appCollisionDemo.rc

@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 1, 1, 2006, 0319
+FILEVERSION 1, 5, 6, 0
-PRODUCTVERSION 1, 1, 2006, 0319
+PRODUCTVERSION 1, 5, 6, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "1.1.2006.0319"
+      VALUE "ProductVersion", "1.5.6"
-      VALUE "FileVersion", "1.1.2006.0319"
+      VALUE "FileVersion", "1.5.6"
       VALUE "LegalCopyright", "Copyright (c) 2005-2006 Erwin Coumans"
       VALUE "FileDescription", "CollisionDemo"
 #ifdef CS_DEBUG
@@ -27,3 +27,4 @@ FILEFLAGS 0x0
     }
   }
 }
+1 ICON "../msvc/bullet_ico.ico"

msvc/appCollisionInterfaceDemo.rc

@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 1, 1, 2006, 0319
+FILEVERSION 1, 5, 6, 0
-PRODUCTVERSION 1, 1, 2006, 0319
+PRODUCTVERSION 1, 5, 6, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "1.1.2006.0319"
+      VALUE "ProductVersion", "1.5.6"
-      VALUE "FileVersion", "1.1.2006.0319"
+      VALUE "FileVersion", "1.5.6"
       VALUE "LegalCopyright", "Copyright (c) 2005-2006 Erwin Coumans"
       VALUE "FileDescription", "CollisionInterfaceDemo"
 #ifdef CS_DEBUG
@@ -27,3 +27,4 @@ FILEFLAGS 0x0
     }
   }
 }
+1 ICON "../msvc/bullet_ico.ico"

msvc/appConcaveDemo.rc

@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 1, 1, 2006, 0319
+FILEVERSION 1, 5, 6, 0
-PRODUCTVERSION 1, 1, 2006, 0319
+PRODUCTVERSION 1, 5, 6, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "1.1.2006.0319"
+      VALUE "ProductVersion", "1.5.6"
-      VALUE "FileVersion", "1.1.2006.0319"
+      VALUE "FileVersion", "1.5.6"
       VALUE "LegalCopyright", "Copyright (c) 2005-2006 Erwin Coumans"
       VALUE "FileDescription", "ConcaveDemo"
 #ifdef CS_DEBUG
@@ -27,3 +27,4 @@ FILEFLAGS 0x0
     }
   }
 }
+1 ICON "../msvc/bullet_ico.ico"

msvc/appConstraintDemo.rc

@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 1, 1, 2006, 0319
+FILEVERSION 1, 5, 6, 0
-PRODUCTVERSION 1, 1, 2006, 0319
+PRODUCTVERSION 1, 5, 6, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "1.1.2006.0319"
+      VALUE "ProductVersion", "1.5.6"
-      VALUE "FileVersion", "1.1.2006.0319"
+      VALUE "FileVersion", "1.5.6"
       VALUE "LegalCopyright", "Copyright (c) 2005-2006 Erwin Coumans"
       VALUE "FileDescription", "ConstraintDemo"
 #ifdef CS_DEBUG
@@ -27,3 +27,4 @@ FILEFLAGS 0x0
     }
   }
 }
+1 ICON "../msvc/bullet_ico.ico"

msvc/appContinuousConvexCollision.rc

@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 1, 1, 2006, 0319
+FILEVERSION 1, 5, 6, 0
-PRODUCTVERSION 1, 1, 2006, 0319
+PRODUCTVERSION 1, 5, 6, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "1.1.2006.0319"
+      VALUE "ProductVersion", "1.5.6"
-      VALUE "FileVersion", "1.1.2006.0319"
+      VALUE "FileVersion", "1.5.6"
       VALUE "LegalCopyright", "Copyright (c) 2005-2006 Erwin Coumans"
       VALUE "FileDescription", "ContinuousConvexCollision"
 #ifdef CS_DEBUG
@@ -27,3 +27,4 @@ FILEFLAGS 0x0
     }
   }
 }
+1 ICON "../msvc/bullet_ico.ico"

msvc/appConvexDecompositionDemo.rc

@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 1, 1, 2006, 0319
+FILEVERSION 1, 5, 6, 0
-PRODUCTVERSION 1, 1, 2006, 0319
+PRODUCTVERSION 1, 5, 6, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "1.1.2006.0319"
+      VALUE "ProductVersion", "1.5.6"
-      VALUE "FileVersion", "1.1.2006.0319"
+      VALUE "FileVersion", "1.5.6"
       VALUE "LegalCopyright", "Copyright (c) 2005-2006 Erwin Coumans"
       VALUE "FileDescription", "ConvexDecompositionDemo"
 #ifdef CS_DEBUG
@@ -27,5 +27,4 @@ FILEFLAGS 0x0
     }
   }
 }
-APPICON                 ICON                    "bullet_ico.ico"
+1 ICON "../msvc/bullet_ico.ico"
-

msvc/appEPAPenDepthDemo.rc

@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 1, 1, 2006, 0319
+FILEVERSION 1, 5, 6, 0
-PRODUCTVERSION 1, 1, 2006, 0319
+PRODUCTVERSION 1, 5, 6, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "1.1.2006.0319"
+      VALUE "ProductVersion", "1.5.6"
-      VALUE "FileVersion", "1.1.2006.0319"
+      VALUE "FileVersion", "1.5.6"
       VALUE "LegalCopyright", "Copyright (c) 2005-2006 Erwin Coumans"
       VALUE "FileDescription", "EPAPenDepthDemo"
 #ifdef CS_DEBUG
@@ -27,3 +27,4 @@ FILEFLAGS 0x0
     }
   }
 }
+1 ICON "../msvc/bullet_ico.ico"

msvc/appGjkConvexCastDemo.rc

@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 1, 1, 2006, 0319
+FILEVERSION 1, 5, 6, 0
-PRODUCTVERSION 1, 1, 2006, 0319
+PRODUCTVERSION 1, 5, 6, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "1.1.2006.0319"
+      VALUE "ProductVersion", "1.5.6"
-      VALUE "FileVersion", "1.1.2006.0319"
+      VALUE "FileVersion", "1.5.6"
       VALUE "LegalCopyright", "Copyright (c) 2005-2006 Erwin Coumans"
       VALUE "FileDescription", "GjkConvexCastDemo"
 #ifdef CS_DEBUG
@@ -27,3 +27,4 @@ FILEFLAGS 0x0
     }
   }
 }
+1 ICON "../msvc/bullet_ico.ico"

msvc/appRaytracer.rc

@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 1, 1, 2006, 0319
+FILEVERSION 1, 5, 6, 0
-PRODUCTVERSION 1, 1, 2006, 0319
+PRODUCTVERSION 1, 5, 6, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "1.1.2006.0319"
+      VALUE "ProductVersion", "1.5.6"
-      VALUE "FileVersion", "1.1.2006.0319"
+      VALUE "FileVersion", "1.5.6"
       VALUE "LegalCopyright", "Copyright (c) 2005-2006 Erwin Coumans"
       VALUE "FileDescription", "Raytracer"
 #ifdef CS_DEBUG
@@ -27,3 +27,4 @@ FILEFLAGS 0x0
     }
   }
 }
+1 ICON "../msvc/bullet_ico.ico"

msvc/appSimplexDemo.rc

@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 1, 1, 2006, 0319
+FILEVERSION 1, 5, 6, 0
-PRODUCTVERSION 1, 1, 2006, 0319
+PRODUCTVERSION 1, 5, 6, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "1.1.2006.0319"
+      VALUE "ProductVersion", "1.5.6"
-      VALUE "FileVersion", "1.1.2006.0319"
+      VALUE "FileVersion", "1.5.6"
       VALUE "LegalCopyright", "Copyright (c) 2005-2006 Erwin Coumans"
       VALUE "FileDescription", "SimplexDemo"
 #ifdef CS_DEBUG
@@ -27,3 +27,4 @@ FILEFLAGS 0x0
     }
   }
 }
+1 ICON "../msvc/bullet_ico.ico"