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

fix on the android.

This commit is contained in:
Jacky 2015-06-09 13:47:29 +08:00
parent 562d4b9a78
commit 74aed5ae85
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/CCAutoPolygon.cpp
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#include "poly2tri/poly2tri.h"
#include "base/CCDirector.h"
#include "renderer/CCTextureCache.h"
#include "external/clipper/clipper.h"
#include "clipper/clipper.h"
#include <algorithm>
#include <math.h>

13
cocos/Android.mk
View File

@ -83,9 +83,7 @@ cocos2d.cpp \
2d/CCTransitionPageTurn.cpp \
2d/CCTransitionProgress.cpp \
2d/CCTweenFunction.cpp \
2d/MarchingSquare.cpp \
2d/SpritePolygon.cpp \
2d/SpritePolygonCache.cpp \
2d/CCAutoPolygon.cpp \
3d/CCFrustum.cpp \
3d/CCPlane.cpp \
platform/CCFileUtils.cpp \
@ -215,7 +213,8 @@ physics3d/CCPhysics3DConstraint.cpp \
../external/poly2tri/sweep/advancing_front.cc \
../external/poly2tri/sweep/cdt.cc \
../external/poly2tri/sweep/sweep_context.cc \
../external/poly2tri/sweep/sweep.cc
../external/poly2tri/sweep/sweep.cc \
../external/clipper/clipper.cpp
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
@ -231,7 +230,8 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/../external/nslog \
$(LOCAL_PATH)/../external/poly2tri \
$(LOCAL_PATH)/../external/poly2tri/common \
$(LOCAL_PATH)/../external/poly2tri/sweep
$(LOCAL_PATH)/../external/poly2tri/sweep \
$(LOCAL_PATH)/../external/clipper
LOCAL_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/platform \
@ -245,7 +245,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/../external/nslog \
$(LOCAL_PATH)/../external/poly2tri \
$(LOCAL_PATH)/../external/poly2tri/common \
$(LOCAL_PATH)/../external/poly2tri/sweep
$(LOCAL_PATH)/../external/poly2tri/sweep \
$(LOCAL_PATH)/../external/clipper
LOCAL_EXPORT_LDLIBS := -lGLESv2 \
-llog \