diff --git a/Demos/Gpu2dDemo/BasicDemo.cpp b/Demos/Gpu2dDemo/BasicDemo.cpp index 8a1a65ea0..7c3435a34 100644 --- a/Demos/Gpu2dDemo/BasicDemo.cpp +++ b/Demos/Gpu2dDemo/BasicDemo.cpp @@ -13,9 +13,10 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -//#include "BulletMultiThreaded/btGpuDefines.h" -//#include "BulletMultiThreaded/btGpuUtilsSharedDefs.h" -//#include "BulletMultiThreaded/btGpuUtilsSharedCode.h" +///The 3 following lines include the CPU implementation of the kernels, keep them in this order. +#include "BulletMultiThreaded/btGpuDefines.h" +#include "BulletMultiThreaded/btGpuUtilsSharedDefs.h" +#include "BulletMultiThreaded/btGpuUtilsSharedCode.h" //---------------------------------------------------------------------------------------- diff --git a/src/BulletMultiThreaded/btGpuUtils.cpp b/src/BulletMultiThreaded/btGpuUtils.cpp deleted file mode 100644 index 4852ff811..000000000 --- a/src/BulletMultiThreaded/btGpuUtils.cpp +++ /dev/null @@ -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" - -//---------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- -