From 71393bac40ea8672f701eac33b64bb9b72812de8 Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Wed, 4 Oct 2006 23:54:22 +0000 Subject: [PATCH] updated buildstuff, collada-dom is now colladadom (should make VisualStudio 6 users happy) --- Demos/Jamfile | 2 +- Extras/COLLADA_DOM/Jamfile | 6 +++--- Extras/GPUphysics/CMakeLists.txt | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Demos/Jamfile b/Demos/Jamfile index 431fca0fa..93f165630 100644 --- a/Demos/Jamfile +++ b/Demos/Jamfile @@ -21,7 +21,7 @@ if $(GLUT.AVAILABLE) = "yes" rule ExtraDemo { Application $(<) : $(>) : noinstall console nomanifest ; - LinkWith $(<) : collada-dom libxml convexdecomposition bulletdynamics bulletcollision bulletopenglsupport bulletmath ; + LinkWith $(<) : colladadom libxml convexdecomposition bulletdynamics bulletcollision bulletopenglsupport bulletmath ; CFlags $(<) : [ FIncludes $(TOP)/Demos/OpenGL ] [ FIncludes $(TOP)/Extras/ConvexDecomposition ] diff --git a/Extras/COLLADA_DOM/Jamfile b/Extras/COLLADA_DOM/Jamfile index e8d87419b..e3baf1ef6 100644 --- a/Extras/COLLADA_DOM/Jamfile +++ b/Extras/COLLADA_DOM/Jamfile @@ -4,7 +4,7 @@ IncludeDir Extras/COLLADA_DOM/include ; IncludeDir Extras/COLLADA_DOM/include/1.4 ; IncludeDir Extras/LibXML/include ; -Library collada-dom : +Library colladadom : [ Wildcard src/dae : *.h *.cpp ] [ Wildcard src/1.4/dom : *.h *.cpp ] [ Wildcard src/modules/LIBXMLPlugin : *.h *.cpp ] @@ -13,13 +13,13 @@ Library collada-dom : ; -CFlags collada-dom : +CFlags colladadom : [ FIncludes $(TOP)/Extras/COLLADA_DOM/include ] [ FIncludes $(TOP)/Extras/COLLADA_DOM/include/1.4 ] [ FIncludes $(TOP)/Extras/LibXML/include ] ; -LibDepends collada-dom : libxml ; +LibDepends colladadom : libxml ; InstallHeader [ Wildcard *.h ] : COLLADA_DOM ; diff --git a/Extras/GPUphysics/CMakeLists.txt b/Extras/GPUphysics/CMakeLists.txt index e0c76c26c..e3b011132 100644 --- a/Extras/GPUphysics/CMakeLists.txt +++ b/Extras/GPUphysics/CMakeLists.txt @@ -59,8 +59,9 @@ LINK_LIBRARIES( ) ADD_EXECUTABLE(GPUphysics - fboSupport.cxx - GPU_physics_demo.cxx - shaderSupport.cxx + clock.cpp + fboSupport.cpp + GPU_physics_demo.cpp + shaderSupport.cpp )