Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #672 from dumganhar/iss943_bada1.2.1 

fixed #943: Box2d can't be compiled successfully on bada sdk 1.2.1
This commit is contained in:
dumganhar 2012-01-11 19:55:49 -08:00
parent e9231e6722 93d0878a36
commit b87dbaea6e
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Box2D/Collision/b2TimeOfImpact.cpp
View File

@ -22,7 +22,12 @@
#include <Box2D/Collision/Shapes/b2CircleShape.h> #include <Box2D/Collision/Shapes/b2CircleShape.h>
#include <Box2D/Collision/Shapes/b2PolygonShape.h> #include <Box2D/Collision/Shapes/b2PolygonShape.h>
#ifdef SHP
#include <stdio.h>
#else
#include <cstdio> #include <cstdio>
#endif
using namespace std; using namespace std;
int32 b2_toiCalls, b2_toiIters, b2_toiMaxIters; int32 b2_toiCalls, b2_toiIters, b2_toiMaxIters;

8
Box2D/Common/b2Settings.cpp
View File

@ -17,11 +17,15 @@
*/ */
#include <Box2D/Common/b2Settings.h> #include <Box2D/Common/b2Settings.h>
#ifdef SHP
#include <FBaseSys.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#else
#include <cstdlib> #include <cstdlib>
#include <cstdio> #include <cstdio>
#include <cstdarg> #include <cstdarg>
#ifdef SHP
#include <FBaseSys.h>
#endif #endif