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

Fix btGpu2dDemo build -> remove btGpuUtils.cpp and re-enable 3 include files for CPU implementation

Browse Source 
(btGpuUtils.cpp requires several build system fixes first)
This commit is contained in:
erwin.coumans
2009-05-16 14:44:28 +00:00
parent a95b2a33bd
commit 8d9c445b73
2 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Demos/Gpu2dDemo/BasicDemo.cpp
View File

@@ -13,9 +13,10 @@ subject to the following restrictions:
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
//#include "BulletMultiThreaded/btGpuDefines.h" ///The 3 following lines include the CPU implementation of the kernels, keep them in this order.
//#include "BulletMultiThreaded/btGpuUtilsSharedDefs.h" #include "BulletMultiThreaded/btGpuDefines.h"
//#include "BulletMultiThreaded/btGpuUtilsSharedCode.h" #include "BulletMultiThreaded/btGpuUtilsSharedDefs.h"
#include "BulletMultiThreaded/btGpuUtilsSharedCode.h"
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------

28
src/BulletMultiThreaded/btGpuUtils.cpp
View File

@@ -1,28 +0,0 @@
/*
Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org
Copyright (C) 2006, 2007 Sony Computer Entertainment Inc.
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.
*/
//----------------------------------------------------------------------------------------
#include "btGpuDefines.h"
#include "btGpuUtilsSharedDefs.h"
//----------------------------------------------------------------------------------------
#include "btGpuUtilsSharedCode.h"
//----------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------