AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2025-01-11 01:40:10 +00:00
Code Issues Releases Wiki Activity

make the menus compile on both (Snow) Leopard and iPhone

Browse Source
This commit is contained in:
erwin.coumans 2009-11-03 05:25:48 +00:00
parent 5acda2d06c
commit 73250b4be2
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Demos/OpenGL/GLDebugFont.cpp
View File

@ -22,8 +22,8 @@ subject to the following restrictions:
//think different //think different
#if defined(__APPLE__) && !defined (VMDMESA) #if defined(__APPLE__) && !defined (VMDMESA)
#include "TargetConditionals.h" #include <TargetConditionals.h>
#if defined (TARGET_OS_IPHONE) || defined (TARGET_IPHONE_SIMULATOR) #if (defined (TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || (defined (TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR)
#import <OpenGLES/ES1/gl.h> #import <OpenGLES/ES1/gl.h>
#define glOrtho glOrthof #define glOrtho glOrthof
#else #else

10
Demos/OpenGL/GL_DialogWindow.h
View File

@ -19,14 +19,10 @@ subject to the following restrictions:
class btCollisionObject; class btCollisionObject;
#ifdef WIN32//for glut.h
#include <windows.h>
#endif
//think different //think different
#if defined(__APPLE__) && !defined (VMDMESA) #if defined(__APPLE__) && !defined (VMDMESA)
#include "TargetConditionals.h" #include <TargetConditionals.h>
#if defined (TARGET_OS_IPHONE) || defined (TARGET_IPHONE_SIMULATOR) #if (defined (TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || (defined (TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR)
#import <OpenGLES/ES1/gl.h> #import <OpenGLES/ES1/gl.h>
#define glOrtho glOrthof #define glOrtho glOrthof
#else #else
@ -43,6 +39,8 @@ class btCollisionObject;
#include <GL/glu.h> #include <GL/glu.h>
#endif #endif
#endif #endif
#include "LinearMath/btScalar.h" #include "LinearMath/btScalar.h"
#include "LinearMath/btAlignedObjectArray.h" #include "LinearMath/btAlignedObjectArray.h"
class btTypedConstraint; class btTypedConstraint;

2
src/BulletMultiThreaded/PpuAddressSpace.h
View File

@ -11,7 +11,9 @@
#if defined(_WIN64) || defined(__LP64__) || defined(__x86_64__) || defined(USE_ADDR64) #if defined(_WIN64) || defined(__LP64__) || defined(__x86_64__) || defined(USE_ADDR64)
typedef uint64_t ppu_address_t; typedef uint64_t ppu_address_t;
#else #else
typedef uint32_t ppu_address_t; typedef uint32_t ppu_address_t;
#endif #endif
#endif #endif