From 0cbc170e28d65ac7b9aa8fd305d4c870cce6574d Mon Sep 17 00:00:00 2001 From: minggo Date: Thu, 14 Feb 2019 15:54:37 +0800 Subject: [PATCH] fix header path include style --- build/cocos2d_libs.xcodeproj/project.pbxproj | 8 +-- build/cocos2d_tests.xcodeproj/project.pbxproj | 6 +- cocos/2d/CCFontFreeType.h | 2 +- cocos/editor-support/spine/Animation.c | 6 +- cocos/editor-support/spine/Animation.h | 6 +- cocos/editor-support/spine/AnimationState.c | 4 +- cocos/editor-support/spine/AnimationState.h | 10 ++-- .../editor-support/spine/AnimationStateData.c | 4 +- .../editor-support/spine/AnimationStateData.h | 6 +- cocos/editor-support/spine/Array.c | 4 +- cocos/editor-support/spine/Array.h | 2 +- cocos/editor-support/spine/Atlas.c | 4 +- cocos/editor-support/spine/Atlas.h | 2 +- .../spine/AtlasAttachmentLoader.c | 4 +- .../spine/AtlasAttachmentLoader.h | 6 +- cocos/editor-support/spine/Attachment.c | 6 +- cocos/editor-support/spine/Attachment.h | 2 +- cocos/editor-support/spine/AttachmentLoader.c | 4 +- cocos/editor-support/spine/AttachmentLoader.h | 6 +- .../spine/AttachmentVertices.cpp | 2 +- cocos/editor-support/spine/Bone.c | 4 +- cocos/editor-support/spine/Bone.h | 4 +- cocos/editor-support/spine/BoneData.c | 4 +- cocos/editor-support/spine/BoneData.h | 2 +- .../spine/BoundingBoxAttachment.c | 4 +- .../spine/BoundingBoxAttachment.h | 10 ++-- .../editor-support/spine/ClippingAttachment.c | 4 +- .../editor-support/spine/ClippingAttachment.h | 10 ++-- .../spine/Cocos2dAttachmentLoader.cpp | 6 +- .../spine/Cocos2dAttachmentLoader.h | 2 +- cocos/editor-support/spine/Color.c | 4 +- cocos/editor-support/spine/Color.h | 2 +- cocos/editor-support/spine/Event.c | 4 +- cocos/editor-support/spine/Event.h | 4 +- cocos/editor-support/spine/EventData.c | 4 +- cocos/editor-support/spine/EventData.h | 2 +- cocos/editor-support/spine/IkConstraint.c | 6 +- cocos/editor-support/spine/IkConstraint.h | 6 +- cocos/editor-support/spine/IkConstraintData.c | 4 +- cocos/editor-support/spine/IkConstraintData.h | 4 +- cocos/editor-support/spine/Json.c | 2 +- cocos/editor-support/spine/MeshAttachment.c | 4 +- cocos/editor-support/spine/MeshAttachment.h | 10 ++-- cocos/editor-support/spine/PathAttachment.c | 4 +- cocos/editor-support/spine/PathAttachment.h | 10 ++-- cocos/editor-support/spine/PathConstraint.c | 6 +- cocos/editor-support/spine/PathConstraint.h | 8 +-- .../editor-support/spine/PathConstraintData.c | 4 +- .../editor-support/spine/PathConstraintData.h | 6 +- cocos/editor-support/spine/PointAttachment.c | 4 +- cocos/editor-support/spine/PointAttachment.h | 10 ++-- cocos/editor-support/spine/RegionAttachment.c | 4 +- cocos/editor-support/spine/RegionAttachment.h | 8 +-- cocos/editor-support/spine/Skeleton.c | 4 +- cocos/editor-support/spine/Skeleton.h | 14 ++--- .../spine/SkeletonAnimation.cpp | 6 +- .../editor-support/spine/SkeletonAnimation.h | 4 +- cocos/editor-support/spine/SkeletonBatch.cpp | 4 +- cocos/editor-support/spine/SkeletonBatch.h | 2 +- cocos/editor-support/spine/SkeletonBinary.c | 8 +-- cocos/editor-support/spine/SkeletonBinary.h | 10 ++-- cocos/editor-support/spine/SkeletonBounds.c | 4 +- cocos/editor-support/spine/SkeletonBounds.h | 6 +- cocos/editor-support/spine/SkeletonClipping.c | 4 +- cocos/editor-support/spine/SkeletonClipping.h | 10 ++-- cocos/editor-support/spine/SkeletonData.c | 4 +- cocos/editor-support/spine/SkeletonData.h | 18 +++--- cocos/editor-support/spine/SkeletonJson.c | 8 +-- cocos/editor-support/spine/SkeletonJson.h | 12 ++-- .../editor-support/spine/SkeletonRenderer.cpp | 12 ++-- cocos/editor-support/spine/SkeletonRenderer.h | 2 +- .../spine/SkeletonTwoColorBatch.cpp | 4 +- .../spine/SkeletonTwoColorBatch.h | 2 +- cocos/editor-support/spine/Skin.c | 4 +- cocos/editor-support/spine/Skin.h | 4 +- cocos/editor-support/spine/Slot.c | 4 +- cocos/editor-support/spine/Slot.h | 8 +-- cocos/editor-support/spine/SlotData.c | 4 +- cocos/editor-support/spine/SlotData.h | 6 +- .../spine/TransformConstraint.c | 6 +- .../spine/TransformConstraint.h | 6 +- .../spine/TransformConstraintData.c | 4 +- .../spine/TransformConstraintData.h | 4 +- cocos/editor-support/spine/Triangulator.c | 4 +- cocos/editor-support/spine/Triangulator.h | 4 +- cocos/editor-support/spine/VertexAttachment.c | 4 +- cocos/editor-support/spine/VertexAttachment.h | 6 +- cocos/editor-support/spine/VertexEffect.c | 4 +- cocos/editor-support/spine/VertexEffect.h | 6 +- cocos/editor-support/spine/extension.c | 2 +- cocos/editor-support/spine/extension.h | 30 +++++----- cocos/editor-support/spine/spine-cocos2dx.cpp | 4 +- cocos/editor-support/spine/spine-cocos2dx.h | 10 ++-- cocos/editor-support/spine/spine.h | 56 +++++++++---------- .../project.pbxproj | 13 ++++- .../project.pbxproj | 12 ++-- external/config.json | 2 +- tests/cpp-tests/Classes/Box2DTestBed/Test.h | 2 +- .../MaterialSystemTest/MaterialSystemTest.cpp | 2 +- .../Classes/Scene3DTest/Scene3DTest.cpp | 2 +- tests/cpp-tests/Classes/SpineTest/SpineTest.h | 2 +- 101 files changed, 314 insertions(+), 303 deletions(-) diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index 77aed8292ab8..9919fa92423e 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -13718,7 +13718,7 @@ 1551A34D158F2AB200E66CFE /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_EXTENSION = a; @@ -13759,7 +13759,7 @@ 1551A34E158F2AB200E66CFE /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_EXTENSION = a; @@ -13872,7 +13872,7 @@ A07A4D621783777C0073F6A7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ENABLE_OBJC_WEAK = YES; ENABLE_BITCODE = NO; EXECUTABLE_PREFIX = ""; @@ -13909,7 +13909,7 @@ A07A4D631783777C0073F6A7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ENABLE_OBJC_WEAK = YES; ENABLE_BITCODE = NO; EXECUTABLE_PREFIX = ""; diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index 74fbdfc84676..badb74cb318f 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -7520,6 +7520,7 @@ 1A0EE41118CDF775004CD58F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-cpp-empty-test"; CODE_SIGN_IDENTITY = "iPhone Developer"; ENABLE_BITCODE = NO; @@ -7540,6 +7541,7 @@ 1A0EE41218CDF775004CD58F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-cpp-empty-test"; CODE_SIGN_IDENTITY = "iPhone Developer"; ENABLE_BITCODE = NO; @@ -8250,7 +8252,7 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; COMBINE_HIDPI_IMAGES = YES; @@ -8281,7 +8283,7 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; COMBINE_HIDPI_IMAGES = YES; diff --git a/cocos/2d/CCFontFreeType.h b/cocos/2d/CCFontFreeType.h index 1ba97a585493..970051468c43 100644 --- a/cocos/2d/CCFontFreeType.h +++ b/cocos/2d/CCFontFreeType.h @@ -32,7 +32,7 @@ #include "2d/CCFont.h" #include -#include +#include "ft2build.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) #define generic GenericFromFreeTypeLibrary diff --git a/cocos/editor-support/spine/Animation.c b/cocos/editor-support/spine/Animation.c index 6c3fea6f2b19..35a2f39ae1ba 100644 --- a/cocos/editor-support/spine/Animation.c +++ b/cocos/editor-support/spine/Animation.c @@ -28,10 +28,10 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/Animation.h" +#include "spine/IkConstraint.h" #include -#include +#include "spine/extension.h" spAnimation* spAnimation_create (const char* name, int timelinesCount) { spAnimation* self = NEW(spAnimation); diff --git a/cocos/editor-support/spine/Animation.h b/cocos/editor-support/spine/Animation.h index 296f8e26ea90..d9ea6d860ffe 100644 --- a/cocos/editor-support/spine/Animation.h +++ b/cocos/editor-support/spine/Animation.h @@ -31,9 +31,9 @@ #ifndef SPINE_ANIMATION_H_ #define SPINE_ANIMATION_H_ -#include -#include -#include +#include "spine/dll.h" +#include "spine/Event.h" +#include "spine/Attachment.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/AnimationState.c b/cocos/editor-support/spine/AnimationState.c index 14ad9dd1510b..3b01a89677cc 100644 --- a/cocos/editor-support/spine/AnimationState.c +++ b/cocos/editor-support/spine/AnimationState.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/AnimationState.h" +#include "spine/extension.h" #include #define SUBSEQUENT 0 diff --git a/cocos/editor-support/spine/AnimationState.h b/cocos/editor-support/spine/AnimationState.h index a8b54e73253f..0963bb81ec92 100644 --- a/cocos/editor-support/spine/AnimationState.h +++ b/cocos/editor-support/spine/AnimationState.h @@ -31,11 +31,11 @@ #ifndef SPINE_ANIMATIONSTATE_H_ #define SPINE_ANIMATIONSTATE_H_ -#include -#include -#include -#include -#include +#include "spine/dll.h" +#include "spine/Animation.h" +#include "spine/AnimationStateData.h" +#include "spine/Event.h" +#include "spine/Array.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/AnimationStateData.c b/cocos/editor-support/spine/AnimationStateData.c index 40279a8e194e..ed7d097bb00a 100644 --- a/cocos/editor-support/spine/AnimationStateData.c +++ b/cocos/editor-support/spine/AnimationStateData.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/AnimationStateData.h" +#include "spine/extension.h" typedef struct _ToEntry _ToEntry; struct _ToEntry { diff --git a/cocos/editor-support/spine/AnimationStateData.h b/cocos/editor-support/spine/AnimationStateData.h index 87bdba5c1892..25f691ee6bcd 100644 --- a/cocos/editor-support/spine/AnimationStateData.h +++ b/cocos/editor-support/spine/AnimationStateData.h @@ -31,9 +31,9 @@ #ifndef SPINE_ANIMATIONSTATEDATA_H_ #define SPINE_ANIMATIONSTATEDATA_H_ -#include -#include -#include +#include "spine/dll.h" +#include "spine/Animation.h" +#include "spine/SkeletonData.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/Array.c b/cocos/editor-support/spine/Array.c index 03a32bc78b31..346f5a4c0461 100644 --- a/cocos/editor-support/spine/Array.c +++ b/cocos/editor-support/spine/Array.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/Array.h" +#include "spine/extension.h" _SP_ARRAY_IMPLEMENT_TYPE(spFloatArray, float) _SP_ARRAY_IMPLEMENT_TYPE(spIntArray, int) diff --git a/cocos/editor-support/spine/Array.h b/cocos/editor-support/spine/Array.h index 3beb083253fe..1362050da0a5 100644 --- a/cocos/editor-support/spine/Array.h +++ b/cocos/editor-support/spine/Array.h @@ -31,7 +31,7 @@ #ifndef SPINE_ARRAY_H #define SPINE_ARRAY_H -#include +#include "spine/dll.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/Atlas.c b/cocos/editor-support/spine/Atlas.c index 00b5364176f3..6977e5e0d6b9 100644 --- a/cocos/editor-support/spine/Atlas.c +++ b/cocos/editor-support/spine/Atlas.c @@ -28,9 +28,9 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include +#include "spine/Atlas.h" #include -#include +#include "spine/extension.h" spAtlasPage* spAtlasPage_create(spAtlas* atlas, const char* name) { spAtlasPage* self = NEW(spAtlasPage); diff --git a/cocos/editor-support/spine/Atlas.h b/cocos/editor-support/spine/Atlas.h index 61637f17909f..15e236827809 100644 --- a/cocos/editor-support/spine/Atlas.h +++ b/cocos/editor-support/spine/Atlas.h @@ -31,7 +31,7 @@ #ifndef SPINE_ATLAS_H_ #define SPINE_ATLAS_H_ -#include +#include "spine/dll.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/AtlasAttachmentLoader.c b/cocos/editor-support/spine/AtlasAttachmentLoader.c index ea686ada0480..aa6866fc4e57 100644 --- a/cocos/editor-support/spine/AtlasAttachmentLoader.c +++ b/cocos/editor-support/spine/AtlasAttachmentLoader.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/AtlasAttachmentLoader.h" +#include "spine/extension.h" spAttachment* _spAtlasAttachmentLoader_createAttachment (spAttachmentLoader* loader, spSkin* skin, spAttachmentType type, const char* name, const char* path) { diff --git a/cocos/editor-support/spine/AtlasAttachmentLoader.h b/cocos/editor-support/spine/AtlasAttachmentLoader.h index a62b14e5b6e3..0ad0ef7122b7 100644 --- a/cocos/editor-support/spine/AtlasAttachmentLoader.h +++ b/cocos/editor-support/spine/AtlasAttachmentLoader.h @@ -31,9 +31,9 @@ #ifndef SPINE_ATLASATTACHMENTLOADER_H_ #define SPINE_ATLASATTACHMENTLOADER_H_ -#include -#include -#include +#include "spine/dll.h" +#include "spine/AttachmentLoader.h" +#include "spine/Atlas.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/Attachment.c b/cocos/editor-support/spine/Attachment.c index 69d547a57b04..5dbaefd16162 100644 --- a/cocos/editor-support/spine/Attachment.c +++ b/cocos/editor-support/spine/Attachment.c @@ -28,9 +28,9 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include -#include +#include "spine/Attachment.h" +#include "spine/extension.h" +#include "spine/Slot.h" typedef struct _spAttachmentVtable { void (*dispose) (spAttachment* self); diff --git a/cocos/editor-support/spine/Attachment.h b/cocos/editor-support/spine/Attachment.h index 39d2cf3a0872..5181777f9f06 100644 --- a/cocos/editor-support/spine/Attachment.h +++ b/cocos/editor-support/spine/Attachment.h @@ -31,7 +31,7 @@ #ifndef SPINE_ATTACHMENT_H_ #define SPINE_ATTACHMENT_H_ -#include +#include "spine/dll.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/AttachmentLoader.c b/cocos/editor-support/spine/AttachmentLoader.c index 6a1e04eaaf69..6287364f4473 100644 --- a/cocos/editor-support/spine/AttachmentLoader.c +++ b/cocos/editor-support/spine/AttachmentLoader.c @@ -28,9 +28,9 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include +#include "spine/AttachmentLoader.h" #include -#include +#include "spine/extension.h" typedef struct _spAttachmentLoaderVtable { spAttachment* (*createAttachment) (spAttachmentLoader* self, spSkin* skin, spAttachmentType type, const char* name, diff --git a/cocos/editor-support/spine/AttachmentLoader.h b/cocos/editor-support/spine/AttachmentLoader.h index 774ff8ecdfce..cb43cf56e666 100644 --- a/cocos/editor-support/spine/AttachmentLoader.h +++ b/cocos/editor-support/spine/AttachmentLoader.h @@ -31,9 +31,9 @@ #ifndef SPINE_ATTACHMENTLOADER_H_ #define SPINE_ATTACHMENTLOADER_H_ -#include -#include -#include +#include "spine/dll.h" +#include "spine/Attachment.h" +#include "spine/Skin.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/AttachmentVertices.cpp b/cocos/editor-support/spine/AttachmentVertices.cpp index ce614ec74688..814c11457a7a 100644 --- a/cocos/editor-support/spine/AttachmentVertices.cpp +++ b/cocos/editor-support/spine/AttachmentVertices.cpp @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include +#include "spine/AttachmentVertices.h" USING_NS_CC; diff --git a/cocos/editor-support/spine/Bone.c b/cocos/editor-support/spine/Bone.c index 66571ab13333..471cf3217052 100644 --- a/cocos/editor-support/spine/Bone.c +++ b/cocos/editor-support/spine/Bone.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/Bone.h" +#include "spine/extension.h" #include static int yDown; diff --git a/cocos/editor-support/spine/Bone.h b/cocos/editor-support/spine/Bone.h index 725152a62748..4f7ca102756e 100644 --- a/cocos/editor-support/spine/Bone.h +++ b/cocos/editor-support/spine/Bone.h @@ -31,8 +31,8 @@ #ifndef SPINE_BONE_H_ #define SPINE_BONE_H_ -#include -#include +#include "spine/dll.h" +#include "spine/BoneData.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/BoneData.c b/cocos/editor-support/spine/BoneData.c index 6338e7f14345..01ff134f8f2a 100644 --- a/cocos/editor-support/spine/BoneData.c +++ b/cocos/editor-support/spine/BoneData.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/BoneData.h" +#include "spine/extension.h" spBoneData* spBoneData_create (int index, const char* name, spBoneData* parent) { spBoneData* self = NEW(spBoneData); diff --git a/cocos/editor-support/spine/BoneData.h b/cocos/editor-support/spine/BoneData.h index 1f4730b1b3b7..59dd2e86c01e 100644 --- a/cocos/editor-support/spine/BoneData.h +++ b/cocos/editor-support/spine/BoneData.h @@ -31,7 +31,7 @@ #ifndef SPINE_BONEDATA_H_ #define SPINE_BONEDATA_H_ -#include +#include "spine/dll.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/BoundingBoxAttachment.c b/cocos/editor-support/spine/BoundingBoxAttachment.c index 2cbea77d8b05..38d3761c4d67 100644 --- a/cocos/editor-support/spine/BoundingBoxAttachment.c +++ b/cocos/editor-support/spine/BoundingBoxAttachment.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/BoundingBoxAttachment.h" +#include "spine/extension.h" void _spBoundingBoxAttachment_dispose (spAttachment* attachment) { spBoundingBoxAttachment* self = SUB_CAST(spBoundingBoxAttachment, attachment); diff --git a/cocos/editor-support/spine/BoundingBoxAttachment.h b/cocos/editor-support/spine/BoundingBoxAttachment.h index 71d4876d30be..8c2d675c3458 100644 --- a/cocos/editor-support/spine/BoundingBoxAttachment.h +++ b/cocos/editor-support/spine/BoundingBoxAttachment.h @@ -31,11 +31,11 @@ #ifndef SPINE_BOUNDINGBOXATTACHMENT_H_ #define SPINE_BOUNDINGBOXATTACHMENT_H_ -#include -#include -#include -#include -#include +#include "spine/dll.h" +#include "spine/Attachment.h" +#include "spine/VertexAttachment.h" +#include "spine/Atlas.h" +#include "spine/Slot.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/ClippingAttachment.c b/cocos/editor-support/spine/ClippingAttachment.c index 0c2d4ab5f7ed..33638f144367 100644 --- a/cocos/editor-support/spine/ClippingAttachment.c +++ b/cocos/editor-support/spine/ClippingAttachment.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/ClippingAttachment.h" +#include "spine/extension.h" void _spClippingAttachment_dispose (spAttachment* attachment) { spClippingAttachment* self = SUB_CAST(spClippingAttachment, attachment); diff --git a/cocos/editor-support/spine/ClippingAttachment.h b/cocos/editor-support/spine/ClippingAttachment.h index 134334d6d727..c66c2fe49cbc 100644 --- a/cocos/editor-support/spine/ClippingAttachment.h +++ b/cocos/editor-support/spine/ClippingAttachment.h @@ -31,11 +31,11 @@ #ifndef SPINE_CLIPPINGATTACHMENT_H_ #define SPINE_CLIPPINGATTACHMENT_H_ -#include -#include -#include -#include -#include +#include "spine/dll.h" +#include "spine/Attachment.h" +#include "spine/VertexAttachment.h" +#include "spine/Atlas.h" +#include "spine/Slot.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/Cocos2dAttachmentLoader.cpp b/cocos/editor-support/spine/Cocos2dAttachmentLoader.cpp index bb91555231b0..1fe8a22628ee 100644 --- a/cocos/editor-support/spine/Cocos2dAttachmentLoader.cpp +++ b/cocos/editor-support/spine/Cocos2dAttachmentLoader.cpp @@ -28,9 +28,9 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include -#include +#include "spine/Cocos2dAttachmentLoader.h" +#include "spine/extension.h" +#include "spine/AttachmentVertices.h" USING_NS_CC; using namespace spine; diff --git a/cocos/editor-support/spine/Cocos2dAttachmentLoader.h b/cocos/editor-support/spine/Cocos2dAttachmentLoader.h index 35f95e9104fa..8bb634ceaed2 100644 --- a/cocos/editor-support/spine/Cocos2dAttachmentLoader.h +++ b/cocos/editor-support/spine/Cocos2dAttachmentLoader.h @@ -31,7 +31,7 @@ #ifndef SPINE_COCOS2DATTACHMENTLOADER_H_ #define SPINE_COCOS2DATTACHMENTLOADER_H_ -#include +#include "spine/AtlasAttachmentLoader.h" extern "C" { diff --git a/cocos/editor-support/spine/Color.c b/cocos/editor-support/spine/Color.c index 02168ee3cce0..365fcb6ab3b3 100644 --- a/cocos/editor-support/spine/Color.c +++ b/cocos/editor-support/spine/Color.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/Color.h" +#include "spine/extension.h" spColor* spColor_create() { return MALLOC(spColor, 1); diff --git a/cocos/editor-support/spine/Color.h b/cocos/editor-support/spine/Color.h index 272ba95524b6..941188398ec9 100644 --- a/cocos/editor-support/spine/Color.h +++ b/cocos/editor-support/spine/Color.h @@ -31,7 +31,7 @@ #ifndef SPINE_COLOR_H_ #define SPINE_COLOR_H_ -#include +#include "spine/dll.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/Event.c b/cocos/editor-support/spine/Event.c index 04b2f67de39b..caa661b087cd 100644 --- a/cocos/editor-support/spine/Event.c +++ b/cocos/editor-support/spine/Event.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/Event.h" +#include "spine/extension.h" spEvent* spEvent_create (float time, spEventData* data) { spEvent* self = NEW(spEvent); diff --git a/cocos/editor-support/spine/Event.h b/cocos/editor-support/spine/Event.h index 308fd3953000..d08052852eca 100644 --- a/cocos/editor-support/spine/Event.h +++ b/cocos/editor-support/spine/Event.h @@ -31,8 +31,8 @@ #ifndef SPINE_EVENT_H_ #define SPINE_EVENT_H_ -#include -#include +#include "spine/dll.h" +#include "spine/EventData.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/EventData.c b/cocos/editor-support/spine/EventData.c index b53fe152f6be..cdbc6461a412 100644 --- a/cocos/editor-support/spine/EventData.c +++ b/cocos/editor-support/spine/EventData.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/EventData.h" +#include "spine/extension.h" spEventData* spEventData_create (const char* name) { spEventData* self = NEW(spEventData); diff --git a/cocos/editor-support/spine/EventData.h b/cocos/editor-support/spine/EventData.h index 459d161c9ee0..628c4486724e 100644 --- a/cocos/editor-support/spine/EventData.h +++ b/cocos/editor-support/spine/EventData.h @@ -31,7 +31,7 @@ #ifndef SPINE_EVENTDATA_H_ #define SPINE_EVENTDATA_H_ -#include +#include "spine/dll.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/IkConstraint.c b/cocos/editor-support/spine/IkConstraint.c index 509bc25d5da7..3b59e4a6c5d8 100644 --- a/cocos/editor-support/spine/IkConstraint.c +++ b/cocos/editor-support/spine/IkConstraint.c @@ -28,9 +28,9 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include -#include +#include "spine/IkConstraint.h" +#include "spine/Skeleton.h" +#include "spine/extension.h" #include spIkConstraint *spIkConstraint_create(spIkConstraintData *data, const spSkeleton *skeleton) { diff --git a/cocos/editor-support/spine/IkConstraint.h b/cocos/editor-support/spine/IkConstraint.h index e9f27ba2e7dd..2ba8157f0721 100644 --- a/cocos/editor-support/spine/IkConstraint.h +++ b/cocos/editor-support/spine/IkConstraint.h @@ -31,9 +31,9 @@ #ifndef SPINE_IKCONSTRAINT_H_ #define SPINE_IKCONSTRAINT_H_ -#include -#include -#include +#include "spine/dll.h" +#include "spine/IkConstraintData.h" +#include "spine/Bone.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/IkConstraintData.c b/cocos/editor-support/spine/IkConstraintData.c index c4d99faecd90..f74de615a9f7 100644 --- a/cocos/editor-support/spine/IkConstraintData.c +++ b/cocos/editor-support/spine/IkConstraintData.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/IkConstraintData.h" +#include "spine/extension.h" spIkConstraintData* spIkConstraintData_create (const char* name) { spIkConstraintData* self = NEW(spIkConstraintData); diff --git a/cocos/editor-support/spine/IkConstraintData.h b/cocos/editor-support/spine/IkConstraintData.h index de8f899c1d26..dd93405e9b05 100644 --- a/cocos/editor-support/spine/IkConstraintData.h +++ b/cocos/editor-support/spine/IkConstraintData.h @@ -31,8 +31,8 @@ #ifndef SPINE_IKCONSTRAINTDATA_H_ #define SPINE_IKCONSTRAINTDATA_H_ -#include -#include +#include "spine/dll.h" +#include "spine/BoneData.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/Json.c b/cocos/editor-support/spine/Json.c index 6225ff00cc82..17cf10b17025 100644 --- a/cocos/editor-support/spine/Json.c +++ b/cocos/editor-support/spine/Json.c @@ -39,7 +39,7 @@ #include #include /* strtod (C89), strtof (C99) */ #include /* strcasecmp (4.4BSD - compatibility), _stricmp (_WIN32) */ -#include +#include "spine/extension.h" #ifndef SPINE_JSON_DEBUG /* Define this to do extra NULL and expected-character checking */ diff --git a/cocos/editor-support/spine/MeshAttachment.c b/cocos/editor-support/spine/MeshAttachment.c index bd1ab94bd056..6bc8d23c604f 100644 --- a/cocos/editor-support/spine/MeshAttachment.c +++ b/cocos/editor-support/spine/MeshAttachment.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/MeshAttachment.h" +#include "spine/extension.h" void _spMeshAttachment_dispose (spAttachment* attachment) { spMeshAttachment* self = SUB_CAST(spMeshAttachment, attachment); diff --git a/cocos/editor-support/spine/MeshAttachment.h b/cocos/editor-support/spine/MeshAttachment.h index 20a7e75ac44c..03b1491512d3 100644 --- a/cocos/editor-support/spine/MeshAttachment.h +++ b/cocos/editor-support/spine/MeshAttachment.h @@ -31,11 +31,11 @@ #ifndef SPINE_MESHATTACHMENT_H_ #define SPINE_MESHATTACHMENT_H_ -#include -#include -#include -#include -#include +#include "spine/dll.h" +#include "spine/Attachment.h" +#include "spine/VertexAttachment.h" +#include "spine/Atlas.h" +#include "spine/Slot.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/PathAttachment.c b/cocos/editor-support/spine/PathAttachment.c index 92305f1b7678..06ef9b508992 100644 --- a/cocos/editor-support/spine/PathAttachment.c +++ b/cocos/editor-support/spine/PathAttachment.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/PathAttachment.h" +#include "spine/extension.h" void _spPathAttachment_dispose (spAttachment* attachment) { spPathAttachment* self = SUB_CAST(spPathAttachment, attachment); diff --git a/cocos/editor-support/spine/PathAttachment.h b/cocos/editor-support/spine/PathAttachment.h index 6584733bd3a1..f6809bbe4e08 100644 --- a/cocos/editor-support/spine/PathAttachment.h +++ b/cocos/editor-support/spine/PathAttachment.h @@ -31,11 +31,11 @@ #ifndef SPINE_PATHATTACHMENT_H_ #define SPINE_PATHATTACHMENT_H_ -#include -#include -#include -#include -#include +#include "spine/dll.h" +#include "spine/Attachment.h" +#include "spine/VertexAttachment.h" +#include "spine/Atlas.h" +#include "spine/Slot.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/PathConstraint.c b/cocos/editor-support/spine/PathConstraint.c index 988d0d1154b0..67be24cbbf50 100644 --- a/cocos/editor-support/spine/PathConstraint.c +++ b/cocos/editor-support/spine/PathConstraint.c @@ -28,9 +28,9 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include -#include +#include "spine/PathConstraint.h" +#include "spine/Skeleton.h" +#include "spine/extension.h" #define PATHCONSTRAINT_NONE -1 #define PATHCONSTRAINT_BEFORE -2 diff --git a/cocos/editor-support/spine/PathConstraint.h b/cocos/editor-support/spine/PathConstraint.h index d6c761eb3a05..73b7e9c89122 100644 --- a/cocos/editor-support/spine/PathConstraint.h +++ b/cocos/editor-support/spine/PathConstraint.h @@ -31,10 +31,10 @@ #ifndef SPINE_PATHCONSTRAINT_H_ #define SPINE_PATHCONSTRAINT_H_ -#include -#include -#include -#include +#include "spine/dll.h" +#include "spine/PathConstraintData.h" +#include "spine/Bone.h" +#include "spine/Slot.h" #include "PathAttachment.h" #ifdef __cplusplus diff --git a/cocos/editor-support/spine/PathConstraintData.c b/cocos/editor-support/spine/PathConstraintData.c index a02f8c3576e6..a1cdfcdc9a80 100644 --- a/cocos/editor-support/spine/PathConstraintData.c +++ b/cocos/editor-support/spine/PathConstraintData.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/PathConstraintData.h" +#include "spine/extension.h" spPathConstraintData* spPathConstraintData_create (const char* name) { spPathConstraintData* self = NEW(spPathConstraintData); diff --git a/cocos/editor-support/spine/PathConstraintData.h b/cocos/editor-support/spine/PathConstraintData.h index 0c515dbea202..41103cf228fc 100644 --- a/cocos/editor-support/spine/PathConstraintData.h +++ b/cocos/editor-support/spine/PathConstraintData.h @@ -31,9 +31,9 @@ #ifndef SPINE_PATHCONSTRAINTDATA_H_ #define SPINE_PATHCONSTRAINTDATA_H_ -#include -#include -#include +#include "spine/dll.h" +#include "spine/BoneData.h" +#include "spine/SlotData.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/PointAttachment.c b/cocos/editor-support/spine/PointAttachment.c index 9a013966352b..bcbe3ea20353 100644 --- a/cocos/editor-support/spine/PointAttachment.c +++ b/cocos/editor-support/spine/PointAttachment.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/PointAttachment.h" +#include "spine/extension.h" void _spPointAttachment_dispose (spAttachment* attachment) { spPathAttachment* self = SUB_CAST(spPathAttachment, attachment); diff --git a/cocos/editor-support/spine/PointAttachment.h b/cocos/editor-support/spine/PointAttachment.h index da8df6cbbdfd..768fa994a6e1 100644 --- a/cocos/editor-support/spine/PointAttachment.h +++ b/cocos/editor-support/spine/PointAttachment.h @@ -31,11 +31,11 @@ #ifndef SPINE_POINTATTACHMENT_H_ #define SPINE_POINTATTACHMENT_H_ -#include -#include -#include -#include -#include +#include "spine/dll.h" +#include "spine/Attachment.h" +#include "spine/VertexAttachment.h" +#include "spine/Atlas.h" +#include "spine/Slot.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/RegionAttachment.c b/cocos/editor-support/spine/RegionAttachment.c index ee905f1d9084..1ba5a5712cc4 100644 --- a/cocos/editor-support/spine/RegionAttachment.c +++ b/cocos/editor-support/spine/RegionAttachment.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/RegionAttachment.h" +#include "spine/extension.h" typedef enum { BLX = 0, BLY, ULX, ULY, URX, URY, BRX, BRY diff --git a/cocos/editor-support/spine/RegionAttachment.h b/cocos/editor-support/spine/RegionAttachment.h index 59249c218aa1..30663f632641 100644 --- a/cocos/editor-support/spine/RegionAttachment.h +++ b/cocos/editor-support/spine/RegionAttachment.h @@ -31,10 +31,10 @@ #ifndef SPINE_REGIONATTACHMENT_H_ #define SPINE_REGIONATTACHMENT_H_ -#include -#include -#include -#include +#include "spine/dll.h" +#include "spine/Attachment.h" +#include "spine/Atlas.h" +#include "spine/Slot.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/Skeleton.c b/cocos/editor-support/spine/Skeleton.c index 125e28b15da4..7c9a3d8b5266 100644 --- a/cocos/editor-support/spine/Skeleton.c +++ b/cocos/editor-support/spine/Skeleton.c @@ -28,10 +28,10 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include +#include "spine/Skeleton.h" #include #include -#include +#include "spine/extension.h" typedef enum { SP_UPDATE_BONE, SP_UPDATE_IK_CONSTRAINT, SP_UPDATE_PATH_CONSTRAINT, SP_UPDATE_TRANSFORM_CONSTRAINT diff --git a/cocos/editor-support/spine/Skeleton.h b/cocos/editor-support/spine/Skeleton.h index 74bc528d19db..60494cdeead1 100644 --- a/cocos/editor-support/spine/Skeleton.h +++ b/cocos/editor-support/spine/Skeleton.h @@ -31,13 +31,13 @@ #ifndef SPINE_SKELETON_H_ #define SPINE_SKELETON_H_ -#include -#include -#include -#include -#include -#include -#include +#include "spine/dll.h" +#include "spine/SkeletonData.h" +#include "spine/Slot.h" +#include "spine/Skin.h" +#include "spine/IkConstraint.h" +#include "spine/TransformConstraint.h" +#include "spine/PathConstraint.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/SkeletonAnimation.cpp b/cocos/editor-support/spine/SkeletonAnimation.cpp index acf53fea8b57..ef1d0d5364dd 100644 --- a/cocos/editor-support/spine/SkeletonAnimation.cpp +++ b/cocos/editor-support/spine/SkeletonAnimation.cpp @@ -28,9 +28,9 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include -#include +#include "spine/SkeletonAnimation.h" +#include "spine/spine-cocos2dx.h" +#include "spine/extension.h" #include USING_NS_CC; diff --git a/cocos/editor-support/spine/SkeletonAnimation.h b/cocos/editor-support/spine/SkeletonAnimation.h index fc7f163cae23..5108909dd51b 100644 --- a/cocos/editor-support/spine/SkeletonAnimation.h +++ b/cocos/editor-support/spine/SkeletonAnimation.h @@ -31,8 +31,8 @@ #ifndef SPINE_SKELETONANIMATION_H_ #define SPINE_SKELETONANIMATION_H_ -#include -#include +#include "spine/spine.h" +#include "spine/SkeletonRenderer.h" #include "cocos2d.h" namespace spine { diff --git a/cocos/editor-support/spine/SkeletonBatch.cpp b/cocos/editor-support/spine/SkeletonBatch.cpp index 7ac3ce419c10..b9361e74e976 100644 --- a/cocos/editor-support/spine/SkeletonBatch.cpp +++ b/cocos/editor-support/spine/SkeletonBatch.cpp @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/SkeletonBatch.h" +#include "spine/extension.h" #include USING_NS_CC; diff --git a/cocos/editor-support/spine/SkeletonBatch.h b/cocos/editor-support/spine/SkeletonBatch.h index eea569739f1a..c3cdb7dd5515 100644 --- a/cocos/editor-support/spine/SkeletonBatch.h +++ b/cocos/editor-support/spine/SkeletonBatch.h @@ -31,7 +31,7 @@ #ifndef SPINE_SKELETONBATCH_H_ #define SPINE_SKELETONBATCH_H_ -#include +#include "spine/spine.h" #include "cocos2d.h" #include diff --git a/cocos/editor-support/spine/SkeletonBinary.c b/cocos/editor-support/spine/SkeletonBinary.c index 97168a5bb0e2..6ad508c2baca 100644 --- a/cocos/editor-support/spine/SkeletonBinary.c +++ b/cocos/editor-support/spine/SkeletonBinary.c @@ -28,11 +28,11 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include +#include "spine/SkeletonBinary.h" #include -#include -#include -#include +#include "spine/extension.h" +#include "spine/AtlasAttachmentLoader.h" +#include "spine/Animation.h" #include "kvec.h" typedef struct { diff --git a/cocos/editor-support/spine/SkeletonBinary.h b/cocos/editor-support/spine/SkeletonBinary.h index 41f50d3171f9..9985cfa4bbf6 100644 --- a/cocos/editor-support/spine/SkeletonBinary.h +++ b/cocos/editor-support/spine/SkeletonBinary.h @@ -31,11 +31,11 @@ #ifndef SPINE_SKELETONBINARY_H_ #define SPINE_SKELETONBINARY_H_ -#include -#include -#include -#include -#include +#include "spine/dll.h" +#include "spine/Attachment.h" +#include "spine/AttachmentLoader.h" +#include "spine/SkeletonData.h" +#include "spine/Atlas.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/SkeletonBounds.c b/cocos/editor-support/spine/SkeletonBounds.c index 5caa6dc8ee14..10ac96765ac2 100644 --- a/cocos/editor-support/spine/SkeletonBounds.c +++ b/cocos/editor-support/spine/SkeletonBounds.c @@ -28,9 +28,9 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include +#include "spine/SkeletonBounds.h" #include -#include +#include "spine/extension.h" spPolygon* spPolygon_create (int capacity) { spPolygon* self = NEW(spPolygon); diff --git a/cocos/editor-support/spine/SkeletonBounds.h b/cocos/editor-support/spine/SkeletonBounds.h index 077dca5c8971..98ca9c58515b 100644 --- a/cocos/editor-support/spine/SkeletonBounds.h +++ b/cocos/editor-support/spine/SkeletonBounds.h @@ -31,9 +31,9 @@ #ifndef SPINE_SKELETONBOUNDS_H_ #define SPINE_SKELETONBOUNDS_H_ -#include -#include -#include +#include "spine/dll.h" +#include "spine/BoundingBoxAttachment.h" +#include "spine/Skeleton.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/SkeletonClipping.c b/cocos/editor-support/spine/SkeletonClipping.c index 8d2c7803c56f..4da622bdb37a 100644 --- a/cocos/editor-support/spine/SkeletonClipping.c +++ b/cocos/editor-support/spine/SkeletonClipping.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/SkeletonClipping.h" +#include "spine/extension.h" spSkeletonClipping* spSkeletonClipping_create() { spSkeletonClipping* clipping = CALLOC(spSkeletonClipping, 1); diff --git a/cocos/editor-support/spine/SkeletonClipping.h b/cocos/editor-support/spine/SkeletonClipping.h index 74f21fccb796..ae7d9f373584 100644 --- a/cocos/editor-support/spine/SkeletonClipping.h +++ b/cocos/editor-support/spine/SkeletonClipping.h @@ -31,11 +31,11 @@ #ifndef SPINE_SKELETONCLIPPING_H #define SPINE_SKELETONCLIPPING_H -#include -#include -#include -#include -#include +#include "spine/dll.h" +#include "spine/Array.h" +#include "spine/ClippingAttachment.h" +#include "spine/Slot.h" +#include "spine/Triangulator.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/SkeletonData.c b/cocos/editor-support/spine/SkeletonData.c index 78a724e45234..a6879c1409b0 100644 --- a/cocos/editor-support/spine/SkeletonData.c +++ b/cocos/editor-support/spine/SkeletonData.c @@ -28,9 +28,9 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include +#include "spine/SkeletonData.h" #include -#include +#include "spine/extension.h" spSkeletonData* spSkeletonData_create () { return NEW(spSkeletonData); diff --git a/cocos/editor-support/spine/SkeletonData.h b/cocos/editor-support/spine/SkeletonData.h index 5383d7d144f7..b608c92fb386 100644 --- a/cocos/editor-support/spine/SkeletonData.h +++ b/cocos/editor-support/spine/SkeletonData.h @@ -31,15 +31,15 @@ #ifndef SPINE_SKELETONDATA_H_ #define SPINE_SKELETONDATA_H_ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "spine/dll.h" +#include "spine/BoneData.h" +#include "spine/SlotData.h" +#include "spine/Skin.h" +#include "spine/EventData.h" +#include "spine/Animation.h" +#include "spine/IkConstraintData.h" +#include "spine/TransformConstraintData.h" +#include "spine/PathConstraintData.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/SkeletonJson.c b/cocos/editor-support/spine/SkeletonJson.c index 842258dee1a1..c21e062442bb 100644 --- a/cocos/editor-support/spine/SkeletonJson.c +++ b/cocos/editor-support/spine/SkeletonJson.c @@ -28,13 +28,13 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include +#include "spine/SkeletonJson.h" #include #include #include "Json.h" -#include -#include -#include +#include "spine/extension.h" +#include "spine/AtlasAttachmentLoader.h" +#include "spine/Array.h" #if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__) #define strdup _strdup diff --git a/cocos/editor-support/spine/SkeletonJson.h b/cocos/editor-support/spine/SkeletonJson.h index 58eacdd8b2b1..88a64ba5fc94 100644 --- a/cocos/editor-support/spine/SkeletonJson.h +++ b/cocos/editor-support/spine/SkeletonJson.h @@ -31,12 +31,12 @@ #ifndef SPINE_SKELETONJSON_H_ #define SPINE_SKELETONJSON_H_ -#include -#include -#include -#include -#include -#include +#include "spine/dll.h" +#include "spine/Attachment.h" +#include "spine/AttachmentLoader.h" +#include "spine/SkeletonData.h" +#include "spine/Atlas.h" +#include "spine/Animation.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/SkeletonRenderer.cpp b/cocos/editor-support/spine/SkeletonRenderer.cpp index 860ce3501101..b8668e73355c 100644 --- a/cocos/editor-support/spine/SkeletonRenderer.cpp +++ b/cocos/editor-support/spine/SkeletonRenderer.cpp @@ -28,12 +28,12 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include -#include -#include -#include -#include +#include "spine/SkeletonRenderer.h" +#include "spine/extension.h" +#include "spine/SkeletonBatch.h" +#include "spine/SkeletonTwoColorBatch.h" +#include "spine/AttachmentVertices.h" +#include "spine/Cocos2dAttachmentLoader.h" #include USING_NS_CC; diff --git a/cocos/editor-support/spine/SkeletonRenderer.h b/cocos/editor-support/spine/SkeletonRenderer.h index adf34bd70bfe..7cae9b8a663b 100644 --- a/cocos/editor-support/spine/SkeletonRenderer.h +++ b/cocos/editor-support/spine/SkeletonRenderer.h @@ -31,7 +31,7 @@ #ifndef SPINE_SKELETONRENDERER_H_ #define SPINE_SKELETONRENDERER_H_ -#include +#include "spine/spine.h" #include "cocos2d.h" namespace spine { diff --git a/cocos/editor-support/spine/SkeletonTwoColorBatch.cpp b/cocos/editor-support/spine/SkeletonTwoColorBatch.cpp index 60a7e94ef855..2c191b9e901a 100644 --- a/cocos/editor-support/spine/SkeletonTwoColorBatch.cpp +++ b/cocos/editor-support/spine/SkeletonTwoColorBatch.cpp @@ -27,8 +27,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/SkeletonTwoColorBatch.h" +#include "spine/extension.h" #include USING_NS_CC; diff --git a/cocos/editor-support/spine/SkeletonTwoColorBatch.h b/cocos/editor-support/spine/SkeletonTwoColorBatch.h index 8035fad47d2c..d69aee5a6870 100644 --- a/cocos/editor-support/spine/SkeletonTwoColorBatch.h +++ b/cocos/editor-support/spine/SkeletonTwoColorBatch.h @@ -31,7 +31,7 @@ #ifndef SPINE_SKELETONTWOCOLORBATCH_H_ #define SPINE_SKELETONTWOCOLORBATCH_H_ -#include +#include "spine/spine.h" #include "cocos2d.h" #include diff --git a/cocos/editor-support/spine/Skin.c b/cocos/editor-support/spine/Skin.c index 66fbd1af0130..6822d456c917 100644 --- a/cocos/editor-support/spine/Skin.c +++ b/cocos/editor-support/spine/Skin.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/Skin.h" +#include "spine/extension.h" _Entry* _Entry_create (int slotIndex, const char* name, spAttachment* attachment) { _Entry* self = NEW(_Entry); diff --git a/cocos/editor-support/spine/Skin.h b/cocos/editor-support/spine/Skin.h index 488ad1450543..a18b37dbc1e7 100644 --- a/cocos/editor-support/spine/Skin.h +++ b/cocos/editor-support/spine/Skin.h @@ -31,8 +31,8 @@ #ifndef SPINE_SKIN_H_ #define SPINE_SKIN_H_ -#include -#include +#include "spine/dll.h" +#include "spine/Attachment.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/Slot.c b/cocos/editor-support/spine/Slot.c index 49888bb5cb85..7d46c9c18966 100644 --- a/cocos/editor-support/spine/Slot.c +++ b/cocos/editor-support/spine/Slot.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/Slot.h" +#include "spine/extension.h" typedef struct { spSlot super; diff --git a/cocos/editor-support/spine/Slot.h b/cocos/editor-support/spine/Slot.h index 16db951b6d9e..54354d4e70ec 100644 --- a/cocos/editor-support/spine/Slot.h +++ b/cocos/editor-support/spine/Slot.h @@ -31,10 +31,10 @@ #ifndef SPINE_SLOT_H_ #define SPINE_SLOT_H_ -#include -#include -#include -#include +#include "spine/dll.h" +#include "spine/Bone.h" +#include "spine/Attachment.h" +#include "spine/SlotData.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/SlotData.c b/cocos/editor-support/spine/SlotData.c index 7ef171e85500..957b828f18ec 100644 --- a/cocos/editor-support/spine/SlotData.c +++ b/cocos/editor-support/spine/SlotData.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/SlotData.h" +#include "spine/extension.h" spSlotData* spSlotData_create (const int index, const char* name, spBoneData* boneData) { spSlotData* self = NEW(spSlotData); diff --git a/cocos/editor-support/spine/SlotData.h b/cocos/editor-support/spine/SlotData.h index 669d01f50cb1..e802461bd131 100644 --- a/cocos/editor-support/spine/SlotData.h +++ b/cocos/editor-support/spine/SlotData.h @@ -31,9 +31,9 @@ #ifndef SPINE_SLOTDATA_H_ #define SPINE_SLOTDATA_H_ -#include -#include -#include +#include "spine/dll.h" +#include "spine/BoneData.h" +#include "spine/Color.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/TransformConstraint.c b/cocos/editor-support/spine/TransformConstraint.c index 233dfa2d6f98..43b5b5c49212 100644 --- a/cocos/editor-support/spine/TransformConstraint.c +++ b/cocos/editor-support/spine/TransformConstraint.c @@ -28,9 +28,9 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include -#include +#include "spine/TransformConstraint.h" +#include "spine/Skeleton.h" +#include "spine/extension.h" spTransformConstraint* spTransformConstraint_create (spTransformConstraintData* data, const spSkeleton* skeleton) { int i; diff --git a/cocos/editor-support/spine/TransformConstraint.h b/cocos/editor-support/spine/TransformConstraint.h index 0af1d8d5d3de..84dcc6a9d1a4 100644 --- a/cocos/editor-support/spine/TransformConstraint.h +++ b/cocos/editor-support/spine/TransformConstraint.h @@ -31,9 +31,9 @@ #ifndef SPINE_TRANSFORMCONSTRAINT_H_ #define SPINE_TRANSFORMCONSTRAINT_H_ -#include -#include -#include +#include "spine/dll.h" +#include "spine/TransformConstraintData.h" +#include "spine/Bone.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/TransformConstraintData.c b/cocos/editor-support/spine/TransformConstraintData.c index c9b3d06e3ef2..62ebf1371f50 100644 --- a/cocos/editor-support/spine/TransformConstraintData.c +++ b/cocos/editor-support/spine/TransformConstraintData.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/TransformConstraintData.h" +#include "spine/extension.h" spTransformConstraintData* spTransformConstraintData_create (const char* name) { spTransformConstraintData* self = NEW(spTransformConstraintData); diff --git a/cocos/editor-support/spine/TransformConstraintData.h b/cocos/editor-support/spine/TransformConstraintData.h index 34920b877dbc..63b1fb3f3d24 100644 --- a/cocos/editor-support/spine/TransformConstraintData.h +++ b/cocos/editor-support/spine/TransformConstraintData.h @@ -31,8 +31,8 @@ #ifndef SPINE_TRANSFORMCONSTRAINTDATA_H_ #define SPINE_TRANSFORMCONSTRAINTDATA_H_ -#include -#include +#include "spine/dll.h" +#include "spine/BoneData.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/Triangulator.c b/cocos/editor-support/spine/Triangulator.c index bc473825850a..0deba5da247a 100644 --- a/cocos/editor-support/spine/Triangulator.c +++ b/cocos/editor-support/spine/Triangulator.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/Triangulator.h" +#include "spine/extension.h" #include spTriangulator* spTriangulator_create() { diff --git a/cocos/editor-support/spine/Triangulator.h b/cocos/editor-support/spine/Triangulator.h index 69863b2f78c7..5a6ace56d6f2 100644 --- a/cocos/editor-support/spine/Triangulator.h +++ b/cocos/editor-support/spine/Triangulator.h @@ -31,8 +31,8 @@ #ifndef SPINE_TRIANGULATOR_H #define SPINE_TRIANGULATOR_H -#include -#include +#include "spine/dll.h" +#include "spine/Array.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/VertexAttachment.c b/cocos/editor-support/spine/VertexAttachment.c index dde19ba5354e..c05525d0169d 100644 --- a/cocos/editor-support/spine/VertexAttachment.c +++ b/cocos/editor-support/spine/VertexAttachment.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/VertexAttachment.h" +#include "spine/extension.h" /* FIXME this is not thread-safe */ static int nextID = 0; diff --git a/cocos/editor-support/spine/VertexAttachment.h b/cocos/editor-support/spine/VertexAttachment.h index 3bb766ade69f..0a0640d8b857 100644 --- a/cocos/editor-support/spine/VertexAttachment.h +++ b/cocos/editor-support/spine/VertexAttachment.h @@ -31,9 +31,9 @@ #ifndef SPINE_VERTEXATTACHMENT_H_ #define SPINE_VERTEXATTACHMENT_H_ -#include -#include -#include +#include "spine/dll.h" +#include "spine/Attachment.h" +#include "spine/Slot.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/VertexEffect.c b/cocos/editor-support/spine/VertexEffect.c index 68d4d1f68043..24ae8c11b9a4 100644 --- a/cocos/editor-support/spine/VertexEffect.c +++ b/cocos/editor-support/spine/VertexEffect.c @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/VertexEffect.h" +#include "spine/extension.h" void _spJitterVertexEffect_begin(spVertexEffect* self, spSkeleton* skeleton) { } diff --git a/cocos/editor-support/spine/VertexEffect.h b/cocos/editor-support/spine/VertexEffect.h index 4f670119b3cd..994ffa01e406 100644 --- a/cocos/editor-support/spine/VertexEffect.h +++ b/cocos/editor-support/spine/VertexEffect.h @@ -31,9 +31,9 @@ #ifndef SPINE_VERTEXEFFECT_H_ #define SPINE_VERTEXEFFECT_H_ -#include -#include -#include +#include "spine/dll.h" +#include "spine/Skeleton.h" +#include "spine/Color.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/extension.c b/cocos/editor-support/spine/extension.c index de1074865afd..64e07b4f1c2e 100644 --- a/cocos/editor-support/spine/extension.c +++ b/cocos/editor-support/spine/extension.c @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include +#include "spine/extension.h" #include float _spInternalRandom () { diff --git a/cocos/editor-support/spine/extension.h b/cocos/editor-support/spine/extension.h index 0823b5667cb4..a75040674657 100644 --- a/cocos/editor-support/spine/extension.h +++ b/cocos/editor-support/spine/extension.h @@ -126,21 +126,21 @@ #define UNUSED(x) (void)(x) -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "stdlib.h" +#include "string.h" +#include "math.h" +#include "spine/Skeleton.h" +#include "spine/Animation.h" +#include "spine/Atlas.h" +#include "spine/AttachmentLoader.h" +#include "spine/VertexAttachment.h" +#include "spine/RegionAttachment.h" +#include "spine/MeshAttachment.h" +#include "spine/BoundingBoxAttachment.h" +#include "spine/ClippingAttachment.h" +#include "spine/PathAttachment.h" +#include "spine/PointAttachment.h" +#include "spine/AnimationState.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/editor-support/spine/spine-cocos2dx.cpp b/cocos/editor-support/spine/spine-cocos2dx.cpp index 6e75b4eed841..c9af6e2544a3 100644 --- a/cocos/editor-support/spine/spine-cocos2dx.cpp +++ b/cocos/editor-support/spine/spine-cocos2dx.cpp @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#include -#include +#include "spine/spine-cocos2dx.h" +#include "spine/extension.h" USING_NS_CC; diff --git a/cocos/editor-support/spine/spine-cocos2dx.h b/cocos/editor-support/spine/spine-cocos2dx.h index 7f09e359ff16..4fd49752eb04 100644 --- a/cocos/editor-support/spine/spine-cocos2dx.h +++ b/cocos/editor-support/spine/spine-cocos2dx.h @@ -31,11 +31,11 @@ #ifndef SPINE_COCOS2DX_H_ #define SPINE_COCOS2DX_H_ -#include +#include "spine/spine.h" #include "cocos2d.h" -#include -#include -#include -#include +#include "spine/Cocos2dAttachmentLoader.h" +#include "spine/SkeletonRenderer.h" +#include "spine/SkeletonAnimation.h" +#include "spine/SkeletonBatch.h" #endif /* SPINE_COCOS2DX_H_ */ diff --git a/cocos/editor-support/spine/spine.h b/cocos/editor-support/spine/spine.h index 6c85d7cb995d..b90f6d16aa9f 100644 --- a/cocos/editor-support/spine/spine.h +++ b/cocos/editor-support/spine/spine.h @@ -31,33 +31,33 @@ #ifndef SPINE_SPINE_H_ #define SPINE_SPINE_H_ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "spine/dll.h" +#include "spine/Animation.h" +#include "spine/AnimationState.h" +#include "spine/AnimationStateData.h" +#include "spine/Atlas.h" +#include "spine/AtlasAttachmentLoader.h" +#include "spine/Attachment.h" +#include "spine/AttachmentLoader.h" +#include "spine/Bone.h" +#include "spine/BoneData.h" +#include "spine/RegionAttachment.h" +#include "spine/VertexAttachment.h" +#include "spine/MeshAttachment.h" +#include "spine/BoundingBoxAttachment.h" +#include "spine/ClippingAttachment.h" +#include "spine/PointAttachment.h" +#include "spine/Skeleton.h" +#include "spine/SkeletonBounds.h" +#include "spine/SkeletonData.h" +#include "spine/SkeletonBinary.h" +#include "spine/SkeletonJson.h" +#include "spine/Skin.h" +#include "spine/Slot.h" +#include "spine/SlotData.h" +#include "spine/SkeletonClipping.h" +#include "spine/Event.h" +#include "spine/EventData.h" +#include "spine/VertexEffect.h" #endif /* SPINE_SPINE_H_ */ diff --git a/cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj b/cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj index b3a6fdf23a5a..0b2d8e3f0495 100644 --- a/cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj +++ b/cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj @@ -475,6 +475,7 @@ 1A5410A418B785A10016A3AF /* libjscocos2d Mac.a */, 1A119E4118BDF19200352BAA /* manual */, 507B427D1C31DCC60067B53E /* libjscocos2d tvOS.a */, + 46AF3B3822154F3100D5AFCD /* Recovered References */, ); sourceTree = ""; }; @@ -716,6 +717,14 @@ name = experimental; sourceTree = ""; }; + 46AF3B3822154F3100D5AFCD /* Recovered References */ = { + isa = PBXGroup; + children = ( + 4BE089EA1ADF967400D65D4B /* jsb_cocos2dx_experimental_webView_manual.h */, + ); + name = "Recovered References"; + sourceTree = ""; + }; BA9FD5CF1BAC0A4600996C85 /* component */ = { isa = PBXGroup; children = ( @@ -1171,7 +1180,7 @@ 1551A34A158F2AB200E66CFE /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_BOOL_CONVERSION = YES; @@ -1208,7 +1217,7 @@ 1551A34B158F2AB200E66CFE /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_BOOL_CONVERSION = YES; diff --git a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj index 4d40a4e945ab..8d014a79eae3 100644 --- a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj +++ b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj @@ -1647,7 +1647,7 @@ 15C1C2CA198748D200A46ACC /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1672,7 +1672,7 @@ 15C1C2CB198748D200A46ACC /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -1698,7 +1698,7 @@ 15EFA614198B2DAA000C57D3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_SEARCH_USER_PATHS = NO; ENABLE_BITCODE = NO; EXECUTABLE_PREFIX = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1719,7 +1719,7 @@ 15EFA615198B2DAA000C57D3 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_SEARCH_USER_PATHS = NO; ENABLE_BITCODE = NO; EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -1741,7 +1741,7 @@ 507B43511C31FA0C0067B53E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_SEARCH_USER_PATHS = NO; EXECUTABLE_PREFIX = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; @@ -1759,7 +1759,7 @@ 507B43521C31FA0C0067B53E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_SEARCH_USER_PATHS = NO; EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/external/config.json b/external/config.json index 5a6bfd21902f..9e9530494269 100644 --- a/external/config.json +++ b/external/config.json @@ -1,5 +1,5 @@ { - "version": "v3-deps-157", + "version": "v3-deps-158", "zip_file_size": "141265643", "repo_name": "cocos2d-x-3rd-party-libs-bin", "repo_parent": "https://github.com/cocos2d/", diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Test.h b/tests/cpp-tests/Classes/Box2DTestBed/Test.h index 7ec5b1c9f551..e34cfeb1fa25 100644 --- a/tests/cpp-tests/Classes/Box2DTestBed/Test.h +++ b/tests/cpp-tests/Classes/Box2DTestBed/Test.h @@ -19,7 +19,7 @@ #ifndef TEST_H #define TEST_H -#include +#include "Box2D/Box2D.h" #include "GLES-Render.h" #include diff --git a/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp b/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp index 721fcd0a3357..e04940124a76 100644 --- a/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp +++ b/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp @@ -27,7 +27,7 @@ #include "MaterialSystemTest.h" #include -#include +#include "spine/spine-cocos2dx.h" #include "../testResource.h" #include "cocos2d.h" diff --git a/tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.cpp b/tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.cpp index f34b76beb59e..3ddc95155290 100644 --- a/tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.cpp +++ b/tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.cpp @@ -26,7 +26,7 @@ #include "ui/CocosGUI.h" #include "renderer/CCRenderState.h" -#include +#include "spine/spine-cocos2dx.h" #include "../testResource.h" #include "../TerrainTest/TerrainTest.h" diff --git a/tests/cpp-tests/Classes/SpineTest/SpineTest.h b/tests/cpp-tests/Classes/SpineTest/SpineTest.h index d9c9b049e676..b3a2b77f7264 100644 --- a/tests/cpp-tests/Classes/SpineTest/SpineTest.h +++ b/tests/cpp-tests/Classes/SpineTest/SpineTest.h @@ -28,7 +28,7 @@ #include "cocos2d.h" #include "../BaseTest.h" -#include +#include "spine/spine-cocos2dx.h" DEFINE_TEST_SUITE(SpineTests);