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

fix OSX build

Browse Source
This commit is contained in:
erwin.coumans
2010-01-20 04:52:07 +00:00
parent 50a3c32a5f
commit ae6c59848f
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -16,14 +16,15 @@ ADD_DEFINITIONS( -D_IRR_STATIC_LIB_ )
ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS ) ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
ADD_DEFINITIONS( -D_CRT_SECURE_NO_DEPRECATE ) ADD_DEFINITIONS( -D_CRT_SECURE_NO_DEPRECATE )
IF (USE_GLUT)
string (REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
remove_definitions(-D_WINDOWS )
ENDIF (USE_GLUT)
ELSE(WIN32) ELSE(WIN32)
OPTION(USE_GLUT "Use Glut" ON) OPTION(USE_GLUT "Use Glut" ON)
ENDIF(WIN32) ENDIF(WIN32)
IF (USE_GLUT)
string (REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
remove_definitions(-D_WINDOWS )
ENDIF (USE_GLUT)
IF(COMMAND cmake_policy) IF(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW) cmake_policy(SET CMP0003 NEW)

9
Demos/OpenGL/GlutStuff.h
View File

@@ -31,12 +31,15 @@ subject to the following restrictions:
#include <windows.h> #include <windows.h>
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
#define BT_ACTIVE_ALT VK_LMENU
#else #else
#include <GL/glut.h> #include <GL/glut.h>
#endif //_WINDOWS
#endif //APPLE
#ifdef _WINDOWS
#define BT_ACTIVE_ALT VK_LMENU
#else
#define BT_KEY_K 'k' #define BT_KEY_K 'k'
#define BT_KEY_LEFT GLUT_KEY_LEFT #define BT_KEY_LEFT GLUT_KEY_LEFT
#define BT_KEY_RIGHT GLUT_KEY_RIGHT #define BT_KEY_RIGHT GLUT_KEY_RIGHT
@@ -54,8 +57,6 @@ subject to the following restrictions:
#define BT_ACTIVE_ALT GLUT_ACTIVE_ALT #define BT_ACTIVE_ALT GLUT_ACTIVE_ALT
#define BT_ACTIVE_CTRL GLUT_ACTIVE_ALT #define BT_ACTIVE_CTRL GLUT_ACTIVE_ALT
#define BT_ACTIVE_SHIFT GLUT_ACTIVE_SHIFT #define BT_ACTIVE_SHIFT GLUT_ACTIVE_SHIFT
#endif
#endif #endif
#if BT_USE_FREEGLUT #if BT_USE_FREEGLUT

3
src/LinearMath/btSerializer.h
View File

@@ -19,6 +19,9 @@ subject to the following restrictions:
#include "btScalar.h" // has definitions like SIMD_FORCE_INLINE #include "btScalar.h" // has definitions like SIMD_FORCE_INLINE
#include "btStackAlloc.h" #include "btStackAlloc.h"
#include "btHashMap.h" #include "btHashMap.h"
#include <memory.h>
#include <string.h>
///only the 32bit versions for now ///only the 32bit versions for now
extern unsigned char sBulletDNAstr[]; extern unsigned char sBulletDNAstr[];