Skip to content

Commit 4db6353

Browse files
author
minggo
authored
fix header path include style (#19395)
1 parent 2675f1d commit 4db6353

File tree

101 files changed

+314
-303
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+314
-303
lines changed

‎build/cocos2d_libs.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13718,7 +13718,7 @@
1371813718
1551A34D158F2AB200E66CFE /* Debug */ = {
1371913719
isa = XCBuildConfiguration;
1372013720
buildSettings = {
13721-
ALWAYS_SEARCH_USER_PATHS = YES;
13721+
ALWAYS_SEARCH_USER_PATHS = NO;
1372213722
CLANG_ENABLE_OBJC_WEAK = YES;
1372313723
COMBINE_HIDPI_IMAGES = YES;
1372413724
EXECUTABLE_EXTENSION = a;
@@ -13759,7 +13759,7 @@
1375913759
1551A34E158F2AB200E66CFE /* Release */ = {
1376013760
isa = XCBuildConfiguration;
1376113761
buildSettings = {
13762-
ALWAYS_SEARCH_USER_PATHS = YES;
13762+
ALWAYS_SEARCH_USER_PATHS = NO;
1376313763
CLANG_ENABLE_OBJC_WEAK = YES;
1376413764
COMBINE_HIDPI_IMAGES = YES;
1376513765
EXECUTABLE_EXTENSION = a;
@@ -13872,7 +13872,7 @@
1387213872
A07A4D621783777C0073F6A7 /* Debug */ = {
1387313873
isa = XCBuildConfiguration;
1387413874
buildSettings = {
13875-
ALWAYS_SEARCH_USER_PATHS = YES;
13875+
ALWAYS_SEARCH_USER_PATHS = NO;
1387613876
CLANG_ENABLE_OBJC_WEAK = YES;
1387713877
ENABLE_BITCODE = NO;
1387813878
EXECUTABLE_PREFIX = "";
@@ -13909,7 +13909,7 @@
1390913909
A07A4D631783777C0073F6A7 /* Release */ = {
1391013910
isa = XCBuildConfiguration;
1391113911
buildSettings = {
13912-
ALWAYS_SEARCH_USER_PATHS = YES;
13912+
ALWAYS_SEARCH_USER_PATHS = NO;
1391313913
CLANG_ENABLE_OBJC_WEAK = YES;
1391413914
ENABLE_BITCODE = NO;
1391513915
EXECUTABLE_PREFIX = "";

‎build/cocos2d_tests.xcodeproj/project.pbxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7520,6 +7520,7 @@
75207520
1A0EE41118CDF775004CD58F /* Debug */ = {
75217521
isa = XCBuildConfiguration;
75227522
buildSettings = {
7523+
ALWAYS_SEARCH_USER_PATHS = NO;
75237524
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-cpp-empty-test";
75247525
CODE_SIGN_IDENTITY = "iPhone Developer";
75257526
ENABLE_BITCODE = NO;
@@ -7540,6 +7541,7 @@
75407541
1A0EE41218CDF775004CD58F /* Release */ = {
75417542
isa = XCBuildConfiguration;
75427543
buildSettings = {
7544+
ALWAYS_SEARCH_USER_PATHS = NO;
75437545
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-cpp-empty-test";
75447546
CODE_SIGN_IDENTITY = "iPhone Developer";
75457547
ENABLE_BITCODE = NO;
@@ -8250,7 +8252,7 @@
82508252
C01FCF4F08A954540054247B /* Debug */ = {
82518253
isa = XCBuildConfiguration;
82528254
buildSettings = {
8253-
ALWAYS_SEARCH_USER_PATHS = YES;
8255+
ALWAYS_SEARCH_USER_PATHS = NO;
82548256
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
82558257
CLANG_CXX_LIBRARY = "libc++";
82568258
COMBINE_HIDPI_IMAGES = YES;
@@ -8281,7 +8283,7 @@
82818283
C01FCF5008A954540054247B /* Release */ = {
82828284
isa = XCBuildConfiguration;
82838285
buildSettings = {
8284-
ALWAYS_SEARCH_USER_PATHS = YES;
8286+
ALWAYS_SEARCH_USER_PATHS = NO;
82858287
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
82868288
CLANG_CXX_LIBRARY = "libc++";
82878289
COMBINE_HIDPI_IMAGES = YES;

‎cocos/2d/CCFontFreeType.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "2d/CCFont.h"
3333

3434
#include <string>
35-
#include <ft2build.h>
35+
#include "ft2build.h"
3636

3737
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
3838
#define generic GenericFromFreeTypeLibrary

‎cocos/editor-support/spine/Animation.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
* POSSIBILITY OF SUCH DAMAGE.
2929
*****************************************************************************/
3030

31-
#include <spine/Animation.h>
32-
#include <spine/IkConstraint.h>
31+
#include "spine/Animation.h"
32+
#include "spine/IkConstraint.h"
3333
#include <limits.h>
34-
#include <spine/extension.h>
34+
#include "spine/extension.h"
3535

3636
spAnimation* spAnimation_create (const char* name, int timelinesCount) {
3737
spAnimation* self = NEW(spAnimation);

‎cocos/editor-support/spine/Animation.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
#ifndef SPINE_ANIMATION_H_
3232
#define SPINE_ANIMATION_H_
3333

34-
#include <spine/dll.h>
35-
#include <spine/Event.h>
36-
#include <spine/Attachment.h>
34+
#include "spine/dll.h"
35+
#include "spine/Event.h"
36+
#include "spine/Attachment.h"
3737

3838
#ifdef __cplusplus
3939
extern "C" {

‎cocos/editor-support/spine/AnimationState.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
* POSSIBILITY OF SUCH DAMAGE.
2929
*****************************************************************************/
3030

31-
#include <spine/AnimationState.h>
32-
#include <spine/extension.h>
31+
#include "spine/AnimationState.h"
32+
#include "spine/extension.h"
3333
#include <limits.h>
3434

3535
#define SUBSEQUENT 0

‎cocos/editor-support/spine/AnimationState.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
#ifndef SPINE_ANIMATIONSTATE_H_
3232
#define SPINE_ANIMATIONSTATE_H_
3333

34-
#include <spine/dll.h>
35-
#include <spine/Animation.h>
36-
#include <spine/AnimationStateData.h>
37-
#include <spine/Event.h>
38-
#include <spine/Array.h>
34+
#include "spine/dll.h"
35+
#include "spine/Animation.h"
36+
#include "spine/AnimationStateData.h"
37+
#include "spine/Event.h"
38+
#include "spine/Array.h"
3939

4040
#ifdef __cplusplus
4141
extern "C" {

‎cocos/editor-support/spine/AnimationStateData.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
* POSSIBILITY OF SUCH DAMAGE.
2929
*****************************************************************************/
3030

31-
#include <spine/AnimationStateData.h>
32-
#include <spine/extension.h>
31+
#include "spine/AnimationStateData.h"
32+
#include "spine/extension.h"
3333

3434
typedef struct _ToEntry _ToEntry;
3535
struct _ToEntry {

‎cocos/editor-support/spine/AnimationStateData.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
#ifndef SPINE_ANIMATIONSTATEDATA_H_
3232
#define SPINE_ANIMATIONSTATEDATA_H_
3333

34-
#include <spine/dll.h>
35-
#include <spine/Animation.h>
36-
#include <spine/SkeletonData.h>
34+
#include "spine/dll.h"
35+
#include "spine/Animation.h"
36+
#include "spine/SkeletonData.h"
3737

3838
#ifdef __cplusplus
3939
extern "C" {

‎cocos/editor-support/spine/Array.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
* POSSIBILITY OF SUCH DAMAGE.
2929
*****************************************************************************/
3030

31-
#include <spine/Array.h>
32-
#include <spine/extension.h>
31+
#include "spine/Array.h"
32+
#include "spine/extension.h"
3333

3434
_SP_ARRAY_IMPLEMENT_TYPE(spFloatArray, float)
3535
_SP_ARRAY_IMPLEMENT_TYPE(spIntArray, int)

‎cocos/editor-support/spine/Array.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#ifndef SPINE_ARRAY_H
3232
#define SPINE_ARRAY_H
3333

34-
#include <spine/dll.h>
34+
#include "spine/dll.h"
3535

3636
#ifdef __cplusplus
3737
extern "C" {

‎cocos/editor-support/spine/Atlas.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
* POSSIBILITY OF SUCH DAMAGE.
2929
*****************************************************************************/
3030

31-
#include <spine/Atlas.h>
31+
#include "spine/Atlas.h"
3232
#include <ctype.h>
33-
#include <spine/extension.h>
33+
#include "spine/extension.h"
3434

3535
spAtlasPage* spAtlasPage_create(spAtlas* atlas, const char* name) {
3636
spAtlasPage* self = NEW(spAtlasPage);

‎cocos/editor-support/spine/Atlas.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#ifndef SPINE_ATLAS_H_
3232
#define SPINE_ATLAS_H_
3333

34-
#include <spine/dll.h>
34+
#include "spine/dll.h"
3535

3636
#ifdef __cplusplus
3737
extern "C" {

‎cocos/editor-support/spine/AtlasAttachmentLoader.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
* POSSIBILITY OF SUCH DAMAGE.
2929
*****************************************************************************/
3030

31-
#include <spine/AtlasAttachmentLoader.h>
32-
#include <spine/extension.h>
31+
#include "spine/AtlasAttachmentLoader.h"
32+
#include "spine/extension.h"
3333

3434
spAttachment* _spAtlasAttachmentLoader_createAttachment (spAttachmentLoader* loader, spSkin* skin, spAttachmentType type,
3535
const char* name, const char* path) {

‎cocos/editor-support/spine/AtlasAttachmentLoader.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
#ifndef SPINE_ATLASATTACHMENTLOADER_H_
3232
#define SPINE_ATLASATTACHMENTLOADER_H_
3333

34-
#include <spine/dll.h>
35-
#include <spine/AttachmentLoader.h>
36-
#include <spine/Atlas.h>
34+
#include "spine/dll.h"
35+
#include "spine/AttachmentLoader.h"
36+
#include "spine/Atlas.h"
3737

3838
#ifdef __cplusplus
3939
extern "C" {

‎cocos/editor-support/spine/Attachment.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
* POSSIBILITY OF SUCH DAMAGE.
2929
*****************************************************************************/
3030

31-
#include <spine/Attachment.h>
32-
#include <spine/extension.h>
33-
#include <spine/Slot.h>
31+
#include "spine/Attachment.h"
32+
#include "spine/extension.h"
33+
#include "spine/Slot.h"
3434

3535
typedef struct _spAttachmentVtable {
3636
void (*dispose) (spAttachment* self);

‎cocos/editor-support/spine/Attachment.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#ifndef SPINE_ATTACHMENT_H_
3232
#define SPINE_ATTACHMENT_H_
3333

34-
#include <spine/dll.h>
34+
#include "spine/dll.h"
3535

3636
#ifdef __cplusplus
3737
extern "C" {

‎cocos/editor-support/spine/AttachmentLoader.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
* POSSIBILITY OF SUCH DAMAGE.
2929
*****************************************************************************/
3030

31-
#include <spine/AttachmentLoader.h>
31+
#include "spine/AttachmentLoader.h"
3232
#include <stdio.h>
33-
#include <spine/extension.h>
33+
#include "spine/extension.h"
3434

3535
typedef struct _spAttachmentLoaderVtable {
3636
spAttachment* (*createAttachment) (spAttachmentLoader* self, spSkin* skin, spAttachmentType type, const char* name,

‎cocos/editor-support/spine/AttachmentLoader.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
#ifndef SPINE_ATTACHMENTLOADER_H_
3232
#define SPINE_ATTACHMENTLOADER_H_
3333

34-
#include <spine/dll.h>
35-
#include <spine/Attachment.h>
36-
#include <spine/Skin.h>
34+
#include "spine/dll.h"
35+
#include "spine/Attachment.h"
36+
#include "spine/Skin.h"
3737

3838
#ifdef __cplusplus
3939
extern "C" {

‎cocos/editor-support/spine/AttachmentVertices.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* POSSIBILITY OF SUCH DAMAGE.
2929
*****************************************************************************/
3030

31-
#include <spine/AttachmentVertices.h>
31+
#include "spine/AttachmentVertices.h"
3232

3333
USING_NS_CC;
3434

‎cocos/editor-support/spine/Bone.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
* POSSIBILITY OF SUCH DAMAGE.
2929
*****************************************************************************/
3030

31-
#include <spine/Bone.h>
32-
#include <spine/extension.h>
31+
#include "spine/Bone.h"
32+
#include "spine/extension.h"
3333
#include <stdio.h>
3434
static int yDown;
3535

‎cocos/editor-support/spine/Bone.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#ifndef SPINE_BONE_H_
3232
#define SPINE_BONE_H_
3333

34-
#include <spine/dll.h>
35-
#include <spine/BoneData.h>
34+
#include "spine/dll.h"
35+
#include "spine/BoneData.h"
3636

3737
#ifdef __cplusplus
3838
extern "C" {

‎cocos/editor-support/spine/BoneData.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
* POSSIBILITY OF SUCH DAMAGE.
2929
*****************************************************************************/
3030

31-
#include <spine/BoneData.h>
32-
#include <spine/extension.h>
31+
#include "spine/BoneData.h"
32+
#include "spine/extension.h"
3333

3434
spBoneData* spBoneData_create (int index, const char* name, spBoneData* parent) {
3535
spBoneData* self = NEW(spBoneData);

‎cocos/editor-support/spine/BoneData.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#ifndef SPINE_BONEDATA_H_
3232
#define SPINE_BONEDATA_H_
3333

34-
#include <spine/dll.h>
34+
#include "spine/dll.h"
3535

3636
#ifdef __cplusplus
3737
extern "C" {

‎cocos/editor-support/spine/BoundingBoxAttachment.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
* POSSIBILITY OF SUCH DAMAGE.
2929
*****************************************************************************/
3030

31-
#include <spine/BoundingBoxAttachment.h>
32-
#include <spine/extension.h>
31+
#include "spine/BoundingBoxAttachment.h"
32+
#include "spine/extension.h"
3333

3434
void _spBoundingBoxAttachment_dispose (spAttachment* attachment) {
3535
spBoundingBoxAttachment* self = SUB_CAST(spBoundingBoxAttachment, attachment);

‎cocos/editor-support/spine/BoundingBoxAttachment.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
#ifndef SPINE_BOUNDINGBOXATTACHMENT_H_
3232
#define SPINE_BOUNDINGBOXATTACHMENT_H_
3333

34-
#include <spine/dll.h>
35-
#include <spine/Attachment.h>
36-
#include <spine/VertexAttachment.h>
37-
#include <spine/Atlas.h>
38-
#include <spine/Slot.h>
34+
#include "spine/dll.h"
35+
#include "spine/Attachment.h"
36+
#include "spine/VertexAttachment.h"
37+
#include "spine/Atlas.h"
38+
#include "spine/Slot.h"
3939

4040
#ifdef __cplusplus
4141
extern "C" {

‎cocos/editor-support/spine/ClippingAttachment.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
* POSSIBILITY OF SUCH DAMAGE.
2929
*****************************************************************************/
3030

31-
#include <spine/ClippingAttachment.h>
32-
#include <spine/extension.h>
31+
#include "spine/ClippingAttachment.h"
32+
#include "spine/extension.h"
3333

3434
void _spClippingAttachment_dispose (spAttachment* attachment) {
3535
spClippingAttachment* self = SUB_CAST(spClippingAttachment, attachment);

‎cocos/editor-support/spine/ClippingAttachment.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
#ifndef SPINE_CLIPPINGATTACHMENT_H_
3232
#define SPINE_CLIPPINGATTACHMENT_H_
3333

34-
#include <spine/dll.h>
35-
#include <spine/Attachment.h>
36-
#include <spine/VertexAttachment.h>
37-
#include <spine/Atlas.h>
38-
#include <spine/Slot.h>
34+
#include "spine/dll.h"
35+
#include "spine/Attachment.h"
36+
#include "spine/VertexAttachment.h"
37+
#include "spine/Atlas.h"
38+
#include "spine/Slot.h"
3939

4040
#ifdef __cplusplus
4141
extern "C" {

‎cocos/editor-support/spine/Cocos2dAttachmentLoader.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
* POSSIBILITY OF SUCH DAMAGE.
2929
*****************************************************************************/
3030

31-
#include <spine/Cocos2dAttachmentLoader.h>
32-
#include <spine/extension.h>
33-
#include <spine/AttachmentVertices.h>
31+
#include "spine/Cocos2dAttachmentLoader.h"
32+
#include "spine/extension.h"
33+
#include "spine/AttachmentVertices.h"
3434

3535
USING_NS_CC;
3636
using namespace spine;

‎cocos/editor-support/spine/Cocos2dAttachmentLoader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#ifndef SPINE_COCOS2DATTACHMENTLOADER_H_
3232
#define SPINE_COCOS2DATTACHMENTLOADER_H_
3333

34-
#include <spine/AtlasAttachmentLoader.h>
34+
#include "spine/AtlasAttachmentLoader.h"
3535

3636
extern "C" {
3737

0 commit comments

Comments
 (0)