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

updated buildstuff, collada-dom is now colladadom (should make VisualStudio 6 users happy)

Browse Source
This commit is contained in:
ejcoumans
2006-10-04 23:54:22 +00:00
parent 323a1046fd
commit 71393bac40
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/Jamfile
View File

@@ -21,7 +21,7 @@ if $(GLUT.AVAILABLE) = "yes"
rule ExtraDemo rule ExtraDemo
{ {
Application $(<) : $(>) : noinstall console nomanifest ; Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : collada-dom libxml convexdecomposition bulletdynamics bulletcollision bulletopenglsupport bulletmath ; LinkWith $(<) : colladadom libxml convexdecomposition bulletdynamics bulletcollision bulletopenglsupport bulletmath ;
CFlags $(<) : CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ] [ FIncludes $(TOP)/Demos/OpenGL ]
[ FIncludes $(TOP)/Extras/ConvexDecomposition ] [ FIncludes $(TOP)/Extras/ConvexDecomposition ]

6
Extras/COLLADA_DOM/Jamfile
View File

@@ -4,7 +4,7 @@ IncludeDir Extras/COLLADA_DOM/include ;
IncludeDir Extras/COLLADA_DOM/include/1.4 ; IncludeDir Extras/COLLADA_DOM/include/1.4 ;
IncludeDir Extras/LibXML/include ; IncludeDir Extras/LibXML/include ;
Library collada-dom : Library colladadom :
[ Wildcard src/dae : *.h *.cpp ] [ Wildcard src/dae : *.h *.cpp ]
[ Wildcard src/1.4/dom : *.h *.cpp ] [ Wildcard src/1.4/dom : *.h *.cpp ]
[ Wildcard src/modules/LIBXMLPlugin : *.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 ]
[ FIncludes $(TOP)/Extras/COLLADA_DOM/include/1.4 ] [ FIncludes $(TOP)/Extras/COLLADA_DOM/include/1.4 ]
[ FIncludes $(TOP)/Extras/LibXML/include ] [ FIncludes $(TOP)/Extras/LibXML/include ]
; ;
LibDepends collada-dom : libxml ; LibDepends colladadom : libxml ;
InstallHeader [ Wildcard *.h ] : COLLADA_DOM ; InstallHeader [ Wildcard *.h ] : COLLADA_DOM ;

7
Extras/GPUphysics/CMakeLists.txt
View File

@@ -59,8 +59,9 @@ LINK_LIBRARIES(
) )
ADD_EXECUTABLE(GPUphysics ADD_EXECUTABLE(GPUphysics
fboSupport.cxx clock.cpp
GPU_physics_demo.cxx fboSupport.cpp
shaderSupport.cxx GPU_physics_demo.cpp
shaderSupport.cpp
) )