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

Fixes to build under MinGW

Browse Source 
thanks to Mikhail, http://code.google.com/p/bullet/issues/detail?id=352
This commit is contained in:
erwin.coumans
2010-03-03 21:40:12 +00:00
parent af754373b2
commit 4fd48ac691
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -122,10 +122,10 @@ ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
ADD_DEFINITIONS( -D_CRT_SECURE_NO_DEPRECATE ) ADD_DEFINITIONS( -D_CRT_SECURE_NO_DEPRECATE )
ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS ) ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS )
IF (USE_GLUT) IF (USE_GLUT AND MSVC)
string (REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) string (REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
remove_definitions(-D_WINDOWS ) remove_definitions(-D_WINDOWS )
ENDIF (USE_GLUT) ENDIF()
ELSE(WIN32) ELSE(WIN32)
OPTION(USE_GLUT "Use Glut" ON) OPTION(USE_GLUT "Use Glut" ON)

2
Extras/Serialize/BulletFileLoader/bChunk.h
View File

@@ -17,7 +17,7 @@ subject to the following restrictions:
#define __BCHUNK_H__ #define __BCHUNK_H__
#ifdef _WIN32 #if defined (_WIN32) && ! defined (__MINGW32__)
#define long64 __int64 #define long64 __int64
#else #else
#define long64 long long #define long64 long long