From d36abec2a923e31620da48713b70c3c7ad7d05b9 Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Sat, 2 Sep 2006 00:01:26 +0000 Subject: [PATCH] updated projectfiles for ColladaConverter, and added Cmake mention in doxygen frontpage --- Bullet/CollisionDispatch/CollisionWorld.h | 2 +- msvc/6/appColladaDemo.dsp | 8 ++++++++ msvc/7/appColladaDemo.vcproj | 6 ++++++ msvc/71/appColladaDemo.vcproj | 6 ++++++ msvc/8/appColladaDemo.vcproj | 6 ++++++ 5 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Bullet/CollisionDispatch/CollisionWorld.h b/Bullet/CollisionDispatch/CollisionWorld.h index 8414ba4e4..d05fcc4a0 100644 --- a/Bullet/CollisionDispatch/CollisionWorld.h +++ b/Bullet/CollisionDispatch/CollisionWorld.h @@ -33,7 +33,7 @@ subject to the following restrictions: * Bullet comes with autogenerated Project Files for Microsoft Visual Studio 6, 7, 7.1 and 8. * The main Workspace/Solution is located in Bullet/msvc/8/wksbullet.sln (replace 8 with your version). * - * Under other platforms, like Linux or Mac OS-X, Bullet can be build using jam, http://www.perforce.com/jam/jam.html . + * Under other platforms, like Linux or Mac OS-X, Bullet can be build using either using cmake, http://www.cmake.org, or jam, http://www.perforce.com/jam/jam.html . cmake can autogenerate Xcode, KDevelop, MSVC and other build systems. just run cmake . in the root of Bullet. * Jam is a build system that can build the library, demos and also autogenerate the MSVC Project Files. * So if you are not using MSVC, you can run configure and jam . * If you don't have jam installed, you can make jam from the included jam-2.5 sources, or download jam from ftp://ftp.perforce.com/pub/jam/ diff --git a/msvc/6/appColladaDemo.dsp b/msvc/6/appColladaDemo.dsp index ef0cfd810..1b767a1b2 100644 --- a/msvc/6/appColladaDemo.dsp +++ b/msvc/6/appColladaDemo.dsp @@ -112,6 +112,10 @@ SOURCE=..\..\Demos\ColladaDemo\BspLoader.cpp # End Source File # Begin Source File +SOURCE=..\..\Demos\ColladaDemo\ColladaConverter.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Demos\ColladaDemo\ColladaDemo.cpp # End Source File # End Group @@ -126,6 +130,10 @@ SOURCE=..\..\Demos\ColladaDemo\BspConverter.h SOURCE=..\..\Demos\ColladaDemo\BspLoader.h # End Source File +# Begin Source File + +SOURCE=..\..\Demos\ColladaDemo\ColladaConverter.h +# End Source File # End Group # Begin Group "Resource Files" diff --git a/msvc/7/appColladaDemo.vcproj b/msvc/7/appColladaDemo.vcproj index f231d07b0..116b49972 100644 --- a/msvc/7/appColladaDemo.vcproj +++ b/msvc/7/appColladaDemo.vcproj @@ -172,6 +172,9 @@ + + @@ -185,6 +188,9 @@ + + + + @@ -185,6 +188,9 @@ + + + + @@ -185,6 +188,9 @@ + +