-
Notifications
You must be signed in to change notification settings - Fork 2
/
cocos2d-x-2.2.3.diff
114 lines (114 loc) · 3.28 KB
/
cocos2d-x-2.2.3.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
Only in cocos2d-x-2.2.3: .DS_Store
Only in cocos2d-x-2.2.3/cocos2dx: .DS_Store
diff -r orig/cocos2d-x-2.2.3/cocos2dx/kazmath/src/mat4.c cocos2d-x-2.2.3/cocos2dx/kazmath/src/mat4.c
219c219
< #if defined(__ARM_NEON__)
---
> #if defined(__ARM_NEON__XXXXX)
diff -r orig/cocos2d-x-2.2.3/cocos2dx/kazmath/src/neon_matrix_impl.c cocos2d-x-2.2.3/cocos2dx/kazmath/src/neon_matrix_impl.c
26c26
< #if defined(__ARM_NEON__)
---
> #if defined(__ARM_NEON__XXXXX)
Only in cocos2d-x-2.2.3/cocos2dx/platform: .DS_Store
diff -r orig/cocos2d-x-2.2.3/cocos2dx/platform/ios/CCApplication.mm cocos2d-x-2.2.3/cocos2dx/platform/ios/CCApplication.mm
50c50
< if (applicationDidFinishLaunching())
---
> if (applicationDidFinishLaunching())
diff -r orig/cocos2d-x-2.2.3/cocos2dx/platform/ios/CCEGLView.mm cocos2d-x-2.2.3/cocos2dx/platform/ios/CCEGLView.mm
41d40
<
Only in cocos2d-x-2.2.3/cocos2dx/platform/third_party: .DS_Store
Only in cocos2d-x-2.2.3/cocos2dx/platform/third_party/ios: .DS_Store
diff -r orig/cocos2d-x-2.2.3/cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj cocos2d-x-2.2.3/cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
1505c1505
< LastUpgradeCheck = 0460;
---
> LastUpgradeCheck = 0510;
1674c1674
< ARCHS = "$(ARCHS_STANDARD_32_BIT)";
---
> CLANG_WARN_BOOL_CONVERSION = YES;
1675a1676
> CLANG_WARN_EMPTY_BODY = YES;
1688a1690
> GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
1689a1692
> GCC_WARN_UNDECLARED_SELECTOR = YES;
1690a1694
> GCC_WARN_UNUSED_FUNCTION = YES;
1692c1696,1697
< IPHONEOS_DEPLOYMENT_TARGET = 5.1;
---
> IPHONEOS_DEPLOYMENT_TARGET = 7.1;
> ONLY_ACTIVE_ARCH = YES;
1693a1699
> VALID_ARCHS = "";
1702c1708
< ARCHS = "$(ARCHS_STANDARD_32_BIT)";
---
> CLANG_WARN_BOOL_CONVERSION = YES;
1703a1710
> CLANG_WARN_EMPTY_BODY = YES;
1713a1721
> GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
1714a1723
> GCC_WARN_UNDECLARED_SELECTOR = YES;
1715a1725
> GCC_WARN_UNUSED_FUNCTION = YES;
1717c1727
< IPHONEOS_DEPLOYMENT_TARGET = 5.1;
---
> IPHONEOS_DEPLOYMENT_TARGET = 7.1;
1719a1730
> VALID_ARCHS = "";
1726a1738
> ARCHS = "$(ARCHS_STANDARD)";
1740a1753
> IPHONEOS_DEPLOYMENT_TARGET = 7.1;
1747a1761
> VALID_ARCHS = "armv7 armv7s";
1753a1768
> ARCHS = "$(ARCHS_STANDARD)";
1766a1782
> IPHONEOS_DEPLOYMENT_TARGET = 7.1;
1773a1790
> VALID_ARCHS = "armv7 armv7s";
Only in cocos2d-x-2.2.3/cocos2dx/proj.ios/cocos2dx.xcodeproj: xcuserdata
Only in cocos2d-x-2.2.3/extensions: .DS_Store
diff -r orig/cocos2d-x-2.2.3/extensions/network/WebSocket.cpp cocos2d-x-2.2.3/extensions/network/WebSocket.cpp
278,284c278
<
< pos = host.find(":");
< if(pos >= 0){
< port = atoi(host.substr(pos+1, host.size()).c_str());
< }
<
< pos = host.find("/", pos);
---
>
285a280
> pos = host.find("/");
287c282,289
< path += host.substr(pos + 1, host.size());
---
> path = host.substr(pos, host.size());
> host.erase(pos, host.size());
> }else{
> pos = host.find("?");
> if(pos >= 0){
> path += host.substr(pos, host.size());
> host.erase(pos, host.size());
> }
289c291
<
---
>
291a294
> port = atoi(host.substr(pos+1, host.size()).c_str());
295d297
<
649a652
> _wsHelper->joinSubThread();
Only in cocos2d-x-2.2.3: projects