Skip to content

Commit cdeb62f

Browse files
author
zhangbin
committed
Merge branch 'cocos2d-3.4' into combine-jsb
Conflicts: external/config.json
2 parents 3a2bb0b + 4d5d5c5 commit cdeb62f

File tree

98 files changed

+5018
-1352
lines changed

Some content is hidden

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

98 files changed

+5018
-1352
lines changed

‎CHANGELOG‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
1-
cocos2d-x-3.4beta0 ??
1+
cocos2d-x-3.4beta0 Dec.31 2014
22
[NEW] 3D: support frustum culling
33
[NEW] Action: MoveTo and MoveBy support Vec3
44
[NEW] Allocator: add custom allocator support, global, default, fixed block, object pool
55
[NEW] Application: added Turkish and Ukrainian language support
66
[NEW] UI:LoadingBar: add TextureResType to LoadingBar's create method
77
[NEW] Director: add setClearColor() to set clear values for the color buffers
8+
[NEW] UI: Added new layout functionality for Cocos Studio, keeps widget margins a fixed set and adjusts the widget size according to the margins.
9+
[NEW] UI: Add gray shader to ui::Button, ui::CheckBox and ui::Slider when the disable state resources are not provided
10+
[NEW] UI: Modify the default behavior when ui::Button, ui::CheckBox and ui::Slider's selected state resources are not provided, the new behavior is scale the normal state texture when the selected state texture are missing.
11+
[NEW] 3rd party libraries: Add prebuilt version of libcurl to Mac and upgrade iOS,Android,Mac and Win32 libcurl to 7.39.0.
12+
[NEW] Replace network module implementation from libcurl to system network API on IOS and Android
813

914
[FIX] ui::Button: fix setTitleColor calls method setColor instead of setTextColor of title label.
15+
[FIX] AssetsManagerEx: Fix assetManager can't download file on Win32
1016
[FIX] FileUtils: WebP format with alpha channel displayed wrong
1117
[FIX] Label: content size of Label is incorrect if the string is set to empty string
18+
[FIX] GLProgramState: fix assert error caused by outdated uniform and attribute cache
1219

13-
cocos2d-x-3.3 Dec.12
20+
cocos2d-x-3.3 Dec.12 2014
1421
[FIX] Billboard: allow billboard rotate along z axis
1522
[FIX] Bundle3D: create aabb for mesh whose aabb does not exist (user custom mesh)
1623
[FIX] EditBox: text position and move animation error on iPhone6 Plus
1724
[FIX] FileUtils: createDirectory(): doesn't invoke closedir() after opendir on platforms other than WP8/WinRT/Windows
1825

19-
cocos2d-x-3.3-rc2 Dec.5
26+
cocos2d-x-3.3-rc2 Dec.5 2014
2027
[FIX] C++: use 100% of one core on Windows
2128
[FIX] Label: when a label is added to a invisible parent node, app will crash if switching from background
2229
[FIX] Label: label will not be shown when using system font on Mac

‎build/cocos2d-win8.1-universal.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.30723.0
4+
VisualStudioVersion = 12.0.31101.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libcocos2d", "libcocos2d", "{B3F299D4-B4CA-4F0B-8BE2-FB328483BC13}"
77
EndProject

‎build/cocos2d_libs.xcodeproj/project.pbxproj‎

Lines changed: 60 additions & 8 deletions
Large diffs are not rendered by default.

‎build/cocos2d_tests.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444
15427B7A198B87AA00DC375D /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; };
4545
15427B7D198B880100DC375D /* lua_cocos2dx_controller_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15427B7B198B880100DC375D /* lua_cocos2dx_controller_manual.cpp */; };
4646
156EAE071977D0BD00F53709 /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; };
47-
15AE17DB19A7235300C27E9E /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EE465A19A7200300AF29F1 /* libcurl.a */; };
48-
15AE17DC19A725A000C27E9E /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EE465A19A7200300AF29F1 /* libcurl.a */; };
4947
15AECE0B195C0F8A00907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; };
5048
15AECE0F195C1FDD00907DB0 /* cocosvideo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */; };
5149
15AECE25195D467D00907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; };
@@ -87,7 +85,6 @@
8785
15CBA9ED196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15CBA9EB196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp */; };
8886
15E66FC8192D957100C20A52 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; };
8987
15E66FD6192DC8C700C20A52 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; };
90-
15EE465B19A7200300AF29F1 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EE465A19A7200300AF29F1 /* libcurl.a */; };
9188
15EFA25B198A4A47000C57D3 /* libluacocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA258198A4A24000C57D3 /* libluacocos2d Mac.a */; };
9289
15EFA270198B25B9000C57D3 /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; };
9390
15EFA273198B265A000C57D3 /* libluacocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA258198A4A24000C57D3 /* libluacocos2d Mac.a */; };
@@ -97,7 +94,6 @@
9794
15EFA68D198B3AD8000C57D3 /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA665198B33EE000C57D3 /* libluacocos2d iOS.a */; };
9895
1A0EE2A218CDF6DA004CD58F /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; };
9996
1A0EE2A518CDF6DA004CD58F /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; };
100-
1A0EE2A618CDF6DA004CD58F /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; };
10197
1A0EE2A718CDF6DA004CD58F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; };
10298
1A0EE2A818CDF6DA004CD58F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; };
10399
1A0EE2A918CDF6DA004CD58F /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482C165F3988007D4F18 /* AudioToolbox.framework */; };
@@ -106,7 +102,6 @@
106102
1A0EE2AC18CDF6DA004CD58F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64826165F394E007D4F18 /* QuartzCore.framework */; };
107103
1A0EE2AD18CDF6DA004CD58F /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64824165F3934007D4F18 /* OpenGL.framework */; };
108104
1A0EE2AE18CDF6DA004CD58F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; };
109-
1A0EE2C918CDF733004CD58F /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; };
110105
1A0EE2CA18CDF733004CD58F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA36018CD9AC00087CE3A /* libz.dylib */; };
111106
1A0EE2CB18CDF733004CD58F /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; };
112107
1A0EE2CC18CDF733004CD58F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA28B18CD91510087CE3A /* Foundation.framework */; };
@@ -143,7 +138,6 @@
143138
1A221C9D191771E400FD2BE4 /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; };
144139
1A97AC001A1DC3E30076D9CC /* PerformanceMathTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A97ABFE1A1DC3E30076D9CC /* PerformanceMathTest.cpp */; };
145140
1A97AC011A1DC3E30076D9CC /* PerformanceMathTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A97ABFE1A1DC3E30076D9CC /* PerformanceMathTest.cpp */; };
146-
1A9F808D177E98A600D9A1CB /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; };
147141
1AAF534D180E2F4E000584C8 /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; };
148142
1AAF5400180E39D4000584C8 /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; };
149143
1ABCA28718CD91510087CE3A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; };
@@ -157,7 +151,6 @@
157151
1ABCA35E18CD9AA50087CE3A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA28B18CD91510087CE3A /* Foundation.framework */; };
158152
1ABCA35F18CD9AAE0087CE3A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; };
159153
1ABCA36118CD9AC00087CE3A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA36018CD9AC00087CE3A /* libz.dylib */; };
160-
1ABCA36218CD9AC60087CE3A /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; };
161154
1ABCA39D18CD9ED80087CE3A /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39C18CD9ED80087CE3A /* AVFoundation.framework */; };
162155
1ABCA39F18CD9EE50087CE3A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39E18CD9EE50087CE3A /* UIKit.framework */; };
163156
1ABCA3A118CD9EF60087CE3A /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A018CD9EF60087CE3A /* OpenGLES.framework */; };
@@ -793,6 +786,8 @@
793786
527B1F4119EFAD44000A1F82 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 527B1F3F19EFAD44000A1F82 /* [email protected] */; };
794787
527B1F4419EFAE13000A1F82 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 527B1F4219EFAE13000A1F82 /* [email protected] */; };
795788
527B1F4519EFAE13000A1F82 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 527B1F4319EFAE13000A1F82 /* [email protected] */; };
789+
52B47A341A534B2B004E4C60 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52B47A331A534B2B004E4C60 /* Security.framework */; };
790+
52B47A351A53A43A004E4C60 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52B47A331A534B2B004E4C60 /* Security.framework */; };
796791
59620E8F1921E5CF002021B6 /* Bug-Child.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59620E8D1921E5CF002021B6 /* Bug-Child.cpp */; };
797792
59620E901921E5CF002021B6 /* Bug-Child.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59620E8D1921E5CF002021B6 /* Bug-Child.cpp */; };
798793
5EBEECB01995247000429821 /* DrawNode3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EBEECAE1995247000429821 /* DrawNode3D.cpp */; };
@@ -1724,6 +1719,7 @@
17241719
527B1F3F19EFAD44000A1F82 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
17251720
527B1F4219EFAE13000A1F82 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
17261721
527B1F4319EFAE13000A1F82 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1722+
52B47A331A534B2B004E4C60 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.1.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
17271723
59620E8D1921E5CF002021B6 /* Bug-Child.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-Child.cpp"; sourceTree = "<group>"; };
17281724
59620E8E1921E5CF002021B6 /* Bug-Child.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-Child.h"; sourceTree = "<group>"; };
17291725
5EBEECAE1995247000429821 /* DrawNode3D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DrawNode3D.cpp; path = Sprite3DTest/DrawNode3D.cpp; sourceTree = "<group>"; };
@@ -1780,7 +1776,6 @@
17801776
files = (
17811777
1A0EE2A218CDF6DA004CD58F /* libcocos2d Mac.a in Frameworks */,
17821778
1A0EE2A518CDF6DA004CD58F /* IOKit.framework in Frameworks */,
1783-
1A0EE2A618CDF6DA004CD58F /* libcurl.dylib in Frameworks */,
17841779
1A0EE2A718CDF6DA004CD58F /* libz.dylib in Frameworks */,
17851780
1A0EE2A818CDF6DA004CD58F /* Foundation.framework in Frameworks */,
17861781
1A0EE2A918CDF6DA004CD58F /* AudioToolbox.framework in Frameworks */,
@@ -1798,7 +1793,6 @@
17981793
files = (
17991794
15EFA270198B25B9000C57D3 /* libcocos2d Mac.a in Frameworks */,
18001795
15EFA25B198A4A47000C57D3 /* libluacocos2d Mac.a in Frameworks */,
1801-
1A0EE2C918CDF733004CD58F /* libcurl.dylib in Frameworks */,
18021796
1A0EE2CA18CDF733004CD58F /* libz.dylib in Frameworks */,
18031797
1A0EE2CB18CDF733004CD58F /* IOKit.framework in Frameworks */,
18041798
1A0EE2CC18CDF733004CD58F /* Foundation.framework in Frameworks */,
@@ -1833,7 +1827,6 @@
18331827
isa = PBXFrameworksBuildPhase;
18341828
buildActionMask = 2147483647;
18351829
files = (
1836-
15AE17DB19A7235300C27E9E /* libcurl.a in Frameworks */,
18371830
15EFA68B198B3AD8000C57D3 /* libcocos2d iOS.a in Frameworks */,
18381831
15EFA68D198B3AD8000C57D3 /* libluacocos2d iOS.a in Frameworks */,
18391832
15AECE25195D467D00907DB0 /* MediaPlayer.framework in Frameworks */,
@@ -1856,7 +1849,6 @@
18561849
files = (
18571850
15EFA273198B265A000C57D3 /* libluacocos2d Mac.a in Frameworks */,
18581851
1ABCA2C318CD92420087CE3A /* libcocos2d Mac.a in Frameworks */,
1859-
1ABCA36218CD9AC60087CE3A /* libcurl.dylib in Frameworks */,
18601852
1ABCA36118CD9AC00087CE3A /* libz.dylib in Frameworks */,
18611853
1ABCA35F18CD9AAE0087CE3A /* IOKit.framework in Frameworks */,
18621854
1ABCA35E18CD9AA50087CE3A /* Foundation.framework in Frameworks */,
@@ -1873,7 +1865,7 @@
18731865
isa = PBXFrameworksBuildPhase;
18741866
buildActionMask = 2147483647;
18751867
files = (
1876-
15AE17DC19A725A000C27E9E /* libcurl.a in Frameworks */,
1868+
52B47A351A53A43A004E4C60 /* Security.framework in Frameworks */,
18771869
15EFA66F198B356E000C57D3 /* libluacocos2d iOS.a in Frameworks */,
18781870
15EFA666198B34D7000C57D3 /* libcocos2d iOS.a in Frameworks */,
18791871
15AECE0B195C0F8A00907DB0 /* MediaPlayer.framework in Frameworks */,
@@ -1896,7 +1888,6 @@
18961888
files = (
18971889
1AAF534D180E2F4E000584C8 /* libcocos2d Mac.a in Frameworks */,
18981890
EDCC747F17C455FD007B692C /* IOKit.framework in Frameworks */,
1899-
1A9F808D177E98A600D9A1CB /* libcurl.dylib in Frameworks */,
19001891
15C6482F165F399D007D4F18 /* libz.dylib in Frameworks */,
19011892
15C64833165F3AFD007D4F18 /* Foundation.framework in Frameworks */,
19021893
15C6482D165F3988007D4F18 /* AudioToolbox.framework in Frameworks */,
@@ -1931,7 +1922,7 @@
19311922
isa = PBXFrameworksBuildPhase;
19321923
buildActionMask = 2147483647;
19331924
files = (
1934-
15EE465B19A7200300AF29F1 /* libcurl.a in Frameworks */,
1925+
52B47A341A534B2B004E4C60 /* Security.framework in Frameworks */,
19351926
3EA0FB66191B933000B170C8 /* MediaPlayer.framework in Frameworks */,
19361927
1AAF5400180E39D4000584C8 /* libcocos2d iOS.a in Frameworks */,
19371928
D60AE43417F7FFE100757E4B /* CoreMotion.framework in Frameworks */,
@@ -3676,6 +3667,7 @@
36763667
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
36773668
isa = PBXGroup;
36783669
children = (
3670+
52B47A331A534B2B004E4C60 /* Security.framework */,
36793671
15EE465A19A7200300AF29F1 /* libcurl.a */,
36803672
15CBA9DC196EEAA6005877BB /* libz.dylib */,
36813673
15CBA9DA196EEA90005877BB /* CoreMotion.framework */,

‎build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.30723.0
4+
VisualStudioVersion = 12.0.31101.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cocos2dShaderCompiler", "Cocos2dShaderCompiler.vcxproj", "{4F6DEF20-AC4C-487F-85B8-5993519E3911}"
77
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libcocos2d", "libcocos2d", "{29321038-F308-421E-B8CA-140BB23D3C6D}"
9-
EndProject
10-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_8_1.Shared", "..\..\..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems", "{5D6F020F-7E72-4494-90A0-2DF11D235DF9}"
11-
EndProject
128
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{ECA7A2AA-8501-4177-8360-322A569B6C3E}"
139
EndProject
1410
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Box2D", "Box2D", "{7CA66464-6A5E-493B-82EF-DBD84F91766F}"
@@ -23,14 +19,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine.Shared", "..\..\..
2319
EndProject
2420
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine.Windows", "..\..\..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Windows\libSpine.Windows.vcxproj", "{F3550FE0-C795-44F6-8FEB-093EB68143AE}"
2521
EndProject
26-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_8_1.Windows", "..\..\..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Windows\libcocos2d_8_1.Windows.vcxproj", "{9335005F-678E-4E8E-9B84-50037216AEC8}"
27-
EndProject
2822
Global
2923
GlobalSection(SharedMSBuildProjectFiles) = preSolution
30-
..\..\..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{9335005f-678e-4e8e-9b84-50037216aec8}*SharedItemsImports = 4
3124
..\..\..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{4a3c6ba8-c227-498b-aa21-40bda27b461f}*SharedItemsImports = 9
3225
..\..\..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{adafd00d-a0d6-46ef-9f0b-ea2880bfe1de}*SharedItemsImports = 9
33-
..\..\..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{5d6f020f-7e72-4494-90a0-2df11d235df9}*SharedItemsImports = 9
3426
..\..\..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{3b26a12d-3a44-47ea-82d2-282660fc844d}*SharedItemsImports = 4
3527
..\..\..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{f3550fe0-c795-44f6-8feb-093eb68143ae}*SharedItemsImports = 4
3628
EndGlobalSection
@@ -85,30 +77,16 @@ Global
8577
{F3550FE0-C795-44F6-8FEB-093EB68143AE}.Release|Win32.Build.0 = Release|Win32
8678
{F3550FE0-C795-44F6-8FEB-093EB68143AE}.Release|x64.ActiveCfg = Release|x64
8779
{F3550FE0-C795-44F6-8FEB-093EB68143AE}.Release|x64.Build.0 = Release|x64
88-
{9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|ARM.ActiveCfg = Debug|ARM
89-
{9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|ARM.Build.0 = Debug|ARM
90-
{9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|Win32.ActiveCfg = Debug|Win32
91-
{9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|Win32.Build.0 = Debug|Win32
92-
{9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|x64.ActiveCfg = Debug|x64
93-
{9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|x64.Build.0 = Debug|x64
94-
{9335005F-678E-4E8E-9B84-50037216AEC8}.Release|ARM.ActiveCfg = Release|ARM
95-
{9335005F-678E-4E8E-9B84-50037216AEC8}.Release|ARM.Build.0 = Release|ARM
96-
{9335005F-678E-4E8E-9B84-50037216AEC8}.Release|Win32.ActiveCfg = Release|Win32
97-
{9335005F-678E-4E8E-9B84-50037216AEC8}.Release|Win32.Build.0 = Release|Win32
98-
{9335005F-678E-4E8E-9B84-50037216AEC8}.Release|x64.ActiveCfg = Release|x64
99-
{9335005F-678E-4E8E-9B84-50037216AEC8}.Release|x64.Build.0 = Release|x64
10080
EndGlobalSection
10181
GlobalSection(SolutionProperties) = preSolution
10282
HideSolutionNode = FALSE
10383
EndGlobalSection
10484
GlobalSection(NestedProjects) = preSolution
105-
{5D6F020F-7E72-4494-90A0-2DF11D235DF9} = {29321038-F308-421E-B8CA-140BB23D3C6D}
10685
{7CA66464-6A5E-493B-82EF-DBD84F91766F} = {ECA7A2AA-8501-4177-8360-322A569B6C3E}
10786
{8F8A69D6-BD64-4BAD-AE20-2D07E7BD57BA} = {ECA7A2AA-8501-4177-8360-322A569B6C3E}
10887
{4A3C6BA8-C227-498B-AA21-40BDA27B461F} = {7CA66464-6A5E-493B-82EF-DBD84F91766F}
10988
{3B26A12D-3A44-47EA-82D2-282660FC844D} = {7CA66464-6A5E-493B-82EF-DBD84F91766F}
11089
{ADAFD00D-A0D6-46EF-9F0B-EA2880BFE1DE} = {8F8A69D6-BD64-4BAD-AE20-2D07E7BD57BA}
11190
{F3550FE0-C795-44F6-8FEB-093EB68143AE} = {8F8A69D6-BD64-4BAD-AE20-2D07E7BD57BA}
112-
{9335005F-678E-4E8E-9B84-50037216AEC8} = {29321038-F308-421E-B8CA-140BB23D3C6D}
11391
EndGlobalSection
11492
EndGlobal

0 commit comments

Comments
 (0)