fix: some file didn't have the svn:eol-style native yet
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
|
||||
noinst_PROGRAMS=TerrainDemo
|
||||
|
||||
TerrainDemo_SOURCES=TerrainDemo.cpp TerrainDemo.h main.cpp
|
||||
TerrainDemo_CXXFLAGS=-I@top_builddir@/src -I@top_builddir@/Demos/OpenGL $(CXXFLAGS)
|
||||
TerrainDemo_LDADD=-L../OpenGL -lbulletopenglsupport -L../../src -lbulletdynamics -lbulletcollision -lbulletmath @opengl_LIBS@
|
||||
|
||||
noinst_PROGRAMS=TerrainDemo
|
||||
|
||||
TerrainDemo_SOURCES=TerrainDemo.cpp TerrainDemo.h main.cpp
|
||||
TerrainDemo_CXXFLAGS=-I@top_builddir@/src -I@top_builddir@/Demos/OpenGL $(CXXFLAGS)
|
||||
TerrainDemo_LDADD=-L../OpenGL -lbulletopenglsupport -L../../src -lbulletdynamics -lbulletcollision -lbulletmath @opengl_LIBS@
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,27 +1,27 @@
|
||||
/*
|
||||
Bullet Continuous Collision Detection and Physics Library
|
||||
Copyright (c) 2003-2006,2008 Erwin Coumans http://continuousphysics.com/Bullet/
|
||||
|
||||
This software is provided 'as-is', without any express or implied warranty.
|
||||
In no event will the authors be held liable for any damages arising from the use of this software.
|
||||
Permission is granted to anyone to use this software for any purpose,
|
||||
including commercial applications, and to alter it and redistribute it freely,
|
||||
subject to the following restrictions:
|
||||
|
||||
1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
|
||||
2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
*/
|
||||
#ifndef TERRAIN_DEMO_H
|
||||
#define TERRAIN_DEMO_H
|
||||
|
||||
|
||||
#include "GlutDemoApplication.h"
|
||||
|
||||
|
||||
// all we need to expose publicly is the factory method!
|
||||
GlutDemoApplication * btCreateTerrainDemo(void);
|
||||
|
||||
|
||||
#endif //TERRAIN_DEMO_H
|
||||
|
||||
/*
|
||||
Bullet Continuous Collision Detection and Physics Library
|
||||
Copyright (c) 2003-2006,2008 Erwin Coumans http://continuousphysics.com/Bullet/
|
||||
|
||||
This software is provided 'as-is', without any express or implied warranty.
|
||||
In no event will the authors be held liable for any damages arising from the use of this software.
|
||||
Permission is granted to anyone to use this software for any purpose,
|
||||
including commercial applications, and to alter it and redistribute it freely,
|
||||
subject to the following restrictions:
|
||||
|
||||
1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
|
||||
2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
*/
|
||||
#ifndef TERRAIN_DEMO_H
|
||||
#define TERRAIN_DEMO_H
|
||||
|
||||
|
||||
#include "GlutDemoApplication.h"
|
||||
|
||||
|
||||
// all we need to expose publicly is the factory method!
|
||||
GlutDemoApplication * btCreateTerrainDemo(void);
|
||||
|
||||
|
||||
#endif //TERRAIN_DEMO_H
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
|
||||
#include "TerrainDemo.h"
|
||||
#include "GlutStuff.h"
|
||||
|
||||
int main(int argc,char** argv)
|
||||
{
|
||||
DemoApplication * demo = btCreateTerrainDemo();
|
||||
btAssert(demo && "failed to create terrain demo object");
|
||||
|
||||
return glutmain(argc, argv, 800, 600,
|
||||
"Terrain Demo. http://www.continuousphysics.com/Bullet/phpBB2/",
|
||||
demo);
|
||||
}
|
||||
|
||||
|
||||
#include "TerrainDemo.h"
|
||||
#include "GlutStuff.h"
|
||||
|
||||
int main(int argc,char** argv)
|
||||
{
|
||||
DemoApplication * demo = btCreateTerrainDemo();
|
||||
btAssert(demo && "failed to create terrain demo object");
|
||||
|
||||
return glutmain(argc, argv, 800, 600,
|
||||
"Terrain Demo. http://www.continuousphysics.com/Bullet/phpBB2/",
|
||||
demo);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user