cocos2d · minggo · Feb 14, 2019 · Feb 14, 2019
diff --git 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
@@ -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
@@ -32,7 +32,7 @@
 #include "2d/CCFont.h"
 
 #include <string>
-#include <ft2build.h>
+#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
@@ -28,10 +28,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#include <spine/Animation.h>
-#include <spine/IkConstraint.h>
+#include "spine/Animation.h"
+#include "spine/IkConstraint.h"
 #include <limits.h>
-#include <spine/extension.h>
+#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
@@ -31,9 +31,9 @@
 #ifndef SPINE_ANIMATION_H_
 #define SPINE_ANIMATION_H_
 
-#include <spine/dll.h>
-#include <spine/Event.h>
-#include <spine/Attachment.h>
+#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
@@ -28,8 +28,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#include <spine/AnimationState.h>
-#include <spine/extension.h>
+#include "spine/AnimationState.h"
+#include "spine/extension.h"
 #include <limits.h>
 
 #define SUBSEQUENT 0

diff --git 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 <spine/dll.h>
-#include <spine/Animation.h>
-#include <spine/AnimationStateData.h>
-#include <spine/Event.h>
-#include <spine/Array.h>
+#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
@@ -28,8 +28,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#include <spine/AnimationStateData.h>
-#include <spine/extension.h>
+#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
@@ -31,9 +31,9 @@
 #ifndef SPINE_ANIMATIONSTATEDATA_H_
 #define SPINE_ANIMATIONSTATEDATA_H_
 
-#include <spine/dll.h>
-#include <spine/Animation.h>
-#include <spine/SkeletonData.h>
+#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
@@ -28,8 +28,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#include <spine/Array.h>
-#include <spine/extension.h>
+#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
@@ -31,7 +31,7 @@
 #ifndef SPINE_ARRAY_H
 #define SPINE_ARRAY_H
 
-#include <spine/dll.h>
+#include "spine/dll.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/cocos/editor-support/spine/Atlas.c b/cocos/editor-support/spine/Atlas.c
@@ -28,9 +28,9 @@
 * POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/
 
-#include <spine/Atlas.h>
+#include "spine/Atlas.h"
 #include <ctype.h>
-#include <spine/extension.h>
+#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
@@ -31,7 +31,7 @@
 #ifndef SPINE_ATLAS_H_
 #define SPINE_ATLAS_H_
 
-#include <spine/dll.h>
+#include "spine/dll.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/cocos/editor-support/spine/AtlasAttachmentLoader.c b/cocos/editor-support/spine/AtlasAttachmentLoader.c
@@ -28,8 +28,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#include <spine/AtlasAttachmentLoader.h>
-#include <spine/extension.h>
+#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
@@ -31,9 +31,9 @@
 #ifndef SPINE_ATLASATTACHMENTLOADER_H_
 #define SPINE_ATLASATTACHMENTLOADER_H_
 
-#include <spine/dll.h>
-#include <spine/AttachmentLoader.h>
-#include <spine/Atlas.h>
+#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
@@ -28,9 +28,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#include <spine/Attachment.h>
-#include <spine/extension.h>
-#include <spine/Slot.h>
+#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
@@ -31,7 +31,7 @@
 #ifndef SPINE_ATTACHMENT_H_
 #define SPINE_ATTACHMENT_H_
 
-#include <spine/dll.h>
+#include "spine/dll.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/cocos/editor-support/spine/AttachmentLoader.c b/cocos/editor-support/spine/AttachmentLoader.c
@@ -28,9 +28,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#include <spine/AttachmentLoader.h>
+#include "spine/AttachmentLoader.h"
 #include <stdio.h>
-#include <spine/extension.h>
+#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
@@ -31,9 +31,9 @@
 #ifndef SPINE_ATTACHMENTLOADER_H_
 #define SPINE_ATTACHMENTLOADER_H_
 
-#include <spine/dll.h>
-#include <spine/Attachment.h>
-#include <spine/Skin.h>
+#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
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#include <spine/AttachmentVertices.h>
+#include "spine/AttachmentVertices.h"
 
 USING_NS_CC;
 

diff --git a/cocos/editor-support/spine/Bone.c b/cocos/editor-support/spine/Bone.c
@@ -28,8 +28,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#include <spine/Bone.h>
-#include <spine/extension.h>
+#include "spine/Bone.h"
+#include "spine/extension.h"
 #include <stdio.h>
 static int yDown;
 

diff --git 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 <spine/dll.h>
-#include <spine/BoneData.h>
+#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
@@ -28,8 +28,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#include <spine/BoneData.h>
-#include <spine/extension.h>
+#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
@@ -31,7 +31,7 @@
 #ifndef SPINE_BONEDATA_H_
 #define SPINE_BONEDATA_H_
 
-#include <spine/dll.h>
+#include "spine/dll.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/cocos/editor-support/spine/BoundingBoxAttachment.c b/cocos/editor-support/spine/BoundingBoxAttachment.c
@@ -28,8 +28,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#include <spine/BoundingBoxAttachment.h>
-#include <spine/extension.h>
+#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
@@ -31,11 +31,11 @@
 #ifndef SPINE_BOUNDINGBOXATTACHMENT_H_
 #define SPINE_BOUNDINGBOXATTACHMENT_H_
 
-#include <spine/dll.h>
-#include <spine/Attachment.h>
-#include <spine/VertexAttachment.h>
-#include <spine/Atlas.h>
-#include <spine/Slot.h>
+#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
@@ -28,8 +28,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#include <spine/ClippingAttachment.h>
-#include <spine/extension.h>
+#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
@@ -31,11 +31,11 @@
 #ifndef SPINE_CLIPPINGATTACHMENT_H_
 #define SPINE_CLIPPINGATTACHMENT_H_
 
-#include <spine/dll.h>
-#include <spine/Attachment.h>
-#include <spine/VertexAttachment.h>
-#include <spine/Atlas.h>
-#include <spine/Slot.h>
+#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
@@ -28,9 +28,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#include <spine/Cocos2dAttachmentLoader.h>
-#include <spine/extension.h>
-#include <spine/AttachmentVertices.h>
+#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
@@ -31,7 +31,7 @@
 #ifndef SPINE_COCOS2DATTACHMENTLOADER_H_
 #define SPINE_COCOS2DATTACHMENTLOADER_H_
 
-#include <spine/AtlasAttachmentLoader.h>
+#include "spine/AtlasAttachmentLoader.h"
 
 extern "C" {