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

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

View File

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

View File

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

View File

@@ -24,15 +24,11 @@ cl_command_queue g_cqCommandQue;
#include "Bullet3Common/b3Logging.h"
#include <Windows.h>
void myprintf(const char* msg)
{
#ifdef _WINDOWS
OutputDebugStringA(msg);
#else
//OutputDebugStringA(msg);
printf(msg);
#endif
}
int main(int argc, char* argv[])
@@ -117,4 +113,4 @@ int main(int argc, char* argv[])
b3Printf("press <Enter>\n");
getchar();
return 0;
}
}