From 5dff1b921a5f57eae4ae1a17a6190e582992d189 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Sun, 3 Apr 2016 12:58:36 +0200 Subject: [PATCH] Cocos2dAttachmentLoader needs to be C++. --- spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.vcxproj | 2 +- .../3/example/proj.win32/spine-cocos2dx.vcxproj.filters | 4 ++-- ...{Cocos2dAttachmentLoader.c => Cocos2dAttachmentLoader.cpp} | 0 spine-cocos2dx/3/src/spine/Cocos2dAttachmentLoader.h | 4 ---- 4 files changed, 3 insertions(+), 7 deletions(-) rename spine-cocos2dx/3/src/spine/{Cocos2dAttachmentLoader.c => Cocos2dAttachmentLoader.cpp} (100%) diff --git a/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.vcxproj b/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.vcxproj index dd41be986..4cfae091f 100644 --- a/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.vcxproj +++ b/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.vcxproj @@ -145,7 +145,7 @@ - + diff --git a/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.vcxproj.filters b/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.vcxproj.filters index e0653582d..539f6f37d 100644 --- a/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.vcxproj.filters +++ b/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.vcxproj.filters @@ -83,10 +83,10 @@ src - + src - + src diff --git a/spine-cocos2dx/3/src/spine/Cocos2dAttachmentLoader.c b/spine-cocos2dx/3/src/spine/Cocos2dAttachmentLoader.cpp similarity index 100% rename from spine-cocos2dx/3/src/spine/Cocos2dAttachmentLoader.c rename to spine-cocos2dx/3/src/spine/Cocos2dAttachmentLoader.cpp diff --git a/spine-cocos2dx/3/src/spine/Cocos2dAttachmentLoader.h b/spine-cocos2dx/3/src/spine/Cocos2dAttachmentLoader.h index cb98f7ea8..34816348e 100644 --- a/spine-cocos2dx/3/src/spine/Cocos2dAttachmentLoader.h +++ b/spine-cocos2dx/3/src/spine/Cocos2dAttachmentLoader.h @@ -34,9 +34,7 @@ #include -#ifdef __cplusplus extern "C" { -#endif typedef struct Cocos2dAttachmentLoader { spAttachmentLoader super; @@ -45,8 +43,6 @@ typedef struct Cocos2dAttachmentLoader { Cocos2dAttachmentLoader* Cocos2dAttachmentLoader_create (spAtlas* atlas); -#ifdef __cplusplus } -#endif #endif /* SPINE_COCOS2DATTACHMENTLOADER_H_ */