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

fix Linux build (tested on Ubuntu 12.10, 32bit)

Browse Source
This commit is contained in:
erwincoumans
2013-06-05 08:51:13 -07:00
parent 7d3b656d2b
commit 74bdccc2cf
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos3/GpuDemos/rigidbody/GpuConvexScene.cpp
View File

@@ -19,7 +19,7 @@
#include "../gwenUserInterface.h" #include "../gwenUserInterface.h"
#include "Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.h" #include "Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.h"
#include "OpenGLWindow/GLPrimitiveRenderer.h" #include "OpenGLWindow/GLPrimitiveRenderer.h"
#include "Bullet3OpenCL/RayCast/b3GpuRayCast.h" #include "Bullet3OpenCL/Raycast/b3GpuRaycast.h"
void GpuConvexScene::setupScene(const ConstructionInfo& ci) void GpuConvexScene::setupScene(const ConstructionInfo& ci)

8
btgui/OpenGLWindow/OpenGLInclude.h
View File

@@ -42,10 +42,10 @@ subject to the following restrictions:
///on Linux only glDrawElementsInstancedARB is defined?!? ///on Linux only glDrawElementsInstancedARB is defined?!?
#ifdef __linux //#ifdef __linux
#define glDrawElementsInstanced glDrawElementsInstancedARB //#define glDrawElementsInstanced glDrawElementsInstancedARB
//
#endif //__linux //#endif //__linux
#endif //__OPENGL_INCLUDE_H #endif //__OPENGL_INCLUDE_H

6
test/OpenCL/BasicInitialize/main.cpp
View File

@@ -24,15 +24,11 @@ cl_command_queue g_cqCommandQue;
#include "Bullet3Common/b3Logging.h" #include "Bullet3Common/b3Logging.h"
#include <Windows.h>
void myprintf(const char* msg) void myprintf(const char* msg)
{ {
#ifdef _WINDOWS //OutputDebugStringA(msg);
OutputDebugStringA(msg);
#else
printf(msg); printf(msg);
#endif
} }
int main(int argc, char* argv[]) int main(int argc, char* argv[])