From 74aed5ae85a1a763799924a812c5581d5dff8d74 Mon Sep 17 00:00:00 2001 From: Jacky Date: Tue, 9 Jun 2015 13:47:29 +0800 Subject: [PATCH] fix on the android. --- cocos/2d/CCAutoPolygon.cpp | 2 +- cocos/Android.mk | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cocos/2d/CCAutoPolygon.cpp b/cocos/2d/CCAutoPolygon.cpp index 0fa8c93385..c561c4af34 100644 --- a/cocos/2d/CCAutoPolygon.cpp +++ b/cocos/2d/CCAutoPolygon.cpp @@ -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 #include diff --git a/cocos/Android.mk b/cocos/Android.mk index 951fadcf2b..d4db318def 100644 --- a/cocos/Android.mk +++ b/cocos/Android.mk @@ -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 \