Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9733 from andyque/update-curl 

Update curl
This commit is contained in:
minggo 2014-12-31 15:13:18 +08:00
parent 956b5567a2 5d9274acf5
commit 3c83bd2fb3
6 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
build/cocos2d_libs.xcodeproj/project.pbxproj
View File

@ -1160,6 +1160,11 @@
292DB16019B461CA00A80320 /* ExtensionDeprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB15D19B461CA00A80320 /* ExtensionDeprecated.cpp */; };
292DB16119B461CA00A80320 /* ExtensionDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB15E19B461CA00A80320 /* ExtensionDeprecated.h */; };
292DB16219B461CA00A80320 /* ExtensionDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB15E19B461CA00A80320 /* ExtensionDeprecated.h */; };
292F1A5D1A5151CE00E479F8 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 292F1A5B1A5151CE00E479F8 /* libcrypto.a */; };
292F1A5E1A5151CE00E479F8 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 292F1A5C1A5151CE00E479F8 /* libssl.a */; };
292F1A631A52447100E479F8 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 292F1A601A52447100E479F8 /* libcrypto.a */; };
292F1A641A52447100E479F8 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 292F1A611A52447100E479F8 /* libcurl.a */; };
292F1A6B1A5250F700E479F8 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 292F1A6A1A5250F700E479F8 /* libssl.a */; };
29394CF019B01DBA00D2DE1A /* UIWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 29394CEC19B01DBA00D2DE1A /* UIWebView.h */; };
29394CF119B01DBA00D2DE1A /* UIWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 29394CEC19B01DBA00D2DE1A /* UIWebView.h */; };
29394CF219B01DBA00D2DE1A /* UIWebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29394CED19B01DBA00D2DE1A /* UIWebView.mm */; };
@ -2401,6 +2406,12 @@
292DB13819B4574100A80320 /* UIEditBoxImpl-stub.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "UIEditBoxImpl-stub.cpp"; sourceTree = "<group>"; };
292DB15D19B461CA00A80320 /* ExtensionDeprecated.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExtensionDeprecated.cpp; sourceTree = "<group>"; };
292DB15E19B461CA00A80320 /* ExtensionDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtensionDeprecated.h; sourceTree = "<group>"; };
292F1A5B1A5151CE00E479F8 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libcrypto.a; sourceTree = "<group>"; };
292F1A5C1A5151CE00E479F8 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libssl.a; sourceTree = "<group>"; };
292F1A601A52447100E479F8 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = ../external/curl/prebuilt/mac/libcrypto.a; sourceTree = "<group>"; };
292F1A611A52447100E479F8 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../external/curl/prebuilt/mac/libcurl.a; sourceTree = "<group>"; };
292F1A661A524F2700E479F8 /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = usr/lib/libssl.dylib; sourceTree = SDKROOT; };
292F1A6A1A5250F700E479F8 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = ../external/curl/prebuilt/mac/libssl.a; sourceTree = "<group>"; };
29394CEC19B01DBA00D2DE1A /* UIWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWebView.h; sourceTree = "<group>"; };
29394CED19B01DBA00D2DE1A /* UIWebView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIWebView.mm; sourceTree = "<group>"; };
29394CEE19B01DBA00D2DE1A /* UIWebViewImpl-ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIWebViewImpl-ios.h"; sourceTree = "<group>"; };
@ -3079,6 +3090,8 @@
files = (
29031E0719BFE8D400EFA1DF /* libchipmunk.a in Frameworks */,
15AE1C1A19AAE3C800C27E9E /* libwebsockets.a in Frameworks */,
292F1A6B1A5250F700E479F8 /* libssl.a in Frameworks */,
292F1A631A52447100E479F8 /* libcrypto.a in Frameworks */,
B217704E1977ED9F009EE11B /* libsqlite3.dylib in Frameworks */,
B21770491977ED4C009EE11B /* libz.dylib in Frameworks */,
B21770471977ED34009EE11B /* QuartzCore.framework in Frameworks */,
@ -3086,6 +3099,7 @@
B21770421977ECF8009EE11B /* ApplicationServices.framework in Frameworks */,
B21770401977ECE6009EE11B /* OpenGL.framework in Frameworks */,
B217703C1977ECB4009EE11B /* IOKit.framework in Frameworks */,
292F1A641A52447100E479F8 /* libcurl.a in Frameworks */,
1A570347180BD0850088DEC7 /* libglfw3.a in Frameworks */,
1A570361180BD1080088DEC7 /* libpng.a in Frameworks */,
1A57037B180BD1C90088DEC7 /* libjpeg.a in Frameworks */,
@ -3101,10 +3115,12 @@
files = (
15AE1C1919AAE30900C27E9E /* libwebsockets.a in Frameworks */,
15AE1B4A19AAD49000C27E9E /* libcurl.a in Frameworks */,
292F1A5E1A5151CE00E479F8 /* libssl.a in Frameworks */,
A07A4CAF1783777C0073F6A7 /* Foundation.framework in Frameworks */,
1A570364180BD1120088DEC7 /* libpng.a in Frameworks */,
1A570378180BD1B40088DEC7 /* libjpeg.a in Frameworks */,
1A5703A4180BD2350088DEC7 /* libtiff.a in Frameworks */,
292F1A5D1A5151CE00E479F8 /* libcrypto.a in Frameworks */,
29031E0919BFE8DE00EFA1DF /* libchipmunk.a in Frameworks */,
1A5703BB180BD2800088DEC7 /* libwebp.a in Frameworks */,
1A57052E180BD3280088DEC7 /* libfreetype.a in Frameworks */,
@ -3175,6 +3191,7 @@
1551A341158F2AB200E66CFE /* Frameworks */ = {
isa = PBXGroup;
children = (
292F1A661A524F2700E479F8 /* libssl.dylib */,
B217704C1977ED8B009EE11B /* libsqlite3.dylib */,
B217704A1977ED55009EE11B /* libcurl.dylib */,
B21770481977ED4C009EE11B /* libz.dylib */,
@ -3977,6 +3994,7 @@
1AAF5405180E3B38000584C8 /* prebuilt */ = {
isa = PBXGroup;
children = (
292F1A5F1A52446100E479F8 /* mac */,
1AAF541B180E3B6A000584C8 /* ios */,
);
name = prebuilt;
@ -3985,6 +4003,8 @@
1AAF541B180E3B6A000584C8 /* ios */ = {
isa = PBXGroup;
children = (
292F1A5B1A5151CE00E479F8 /* libcrypto.a */,
292F1A5C1A5151CE00E479F8 /* libssl.a */,
1AAF541C180E3B6A000584C8 /* libcurl.a */,
);
name = ios;
@ -4236,6 +4256,16 @@
path = UIEditBox;
sourceTree = "<group>";
};
292F1A5F1A52446100E479F8 /* mac */ = {
isa = PBXGroup;
children = (
292F1A6A1A5250F700E479F8 /* libssl.a */,
292F1A601A52447100E479F8 /* libcrypto.a */,
292F1A611A52447100E479F8 /* libcurl.a */,
);
name = mac;
sourceTree = "<group>";
};
296BF6121A4403380038EC44 /* shaders */ = {
isa = PBXGroup;
children = (
@ -7406,9 +7436,11 @@
"\"$(SRCROOT)/../external/freetype2/prebuilt/mac\"",
"\"$(SRCROOT)/../external/websockets/prebuilt/mac\"",
"\"$(SRCROOT)/../external/chipmunk/prebuilt/mac\"",
"\"$(SRCROOT)/../external/curl/prebuilt/mac\"",
);
MACH_O_TYPE = staticlib;
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/chipmunk/include/chipmunk";
OTHER_LDFLAGS = "";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../external/curl/include/mac";
};
name = Debug;
};
@ -7440,9 +7472,11 @@
"\"$(SRCROOT)/../external/freetype2/prebuilt/mac\"",
"\"$(SRCROOT)/../external/websockets/prebuilt/mac\"",
"\"$(SRCROOT)/../external/chipmunk/prebuilt/mac\"",
"\"$(SRCROOT)/../external/curl/prebuilt/mac\"",
);
MACH_O_TYPE = staticlib;
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/chipmunk/include/chipmunk";
OTHER_LDFLAGS = "";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../external/curl/include/mac";
};
name = Release;
};

14
build/cocos2d_tests.xcodeproj/project.pbxproj
View File

@ -44,8 +44,6 @@
15427B7A198B87AA00DC375D /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; };
15427B7D198B880100DC375D /* lua_cocos2dx_controller_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15427B7B198B880100DC375D /* lua_cocos2dx_controller_manual.cpp */; };
156EAE071977D0BD00F53709 /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; };
15AE17DB19A7235300C27E9E /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EE465A19A7200300AF29F1 /* libcurl.a */; };
15AE17DC19A725A000C27E9E /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EE465A19A7200300AF29F1 /* libcurl.a */; };
15AECE0B195C0F8A00907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; };
15AECE0F195C1FDD00907DB0 /* cocosvideo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */; };
15AECE25195D467D00907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; };
@ -87,7 +85,6 @@
15CBA9ED196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15CBA9EB196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp */; };
15E66FC8192D957100C20A52 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; };
15E66FD6192DC8C700C20A52 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; };
15EE465B19A7200300AF29F1 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EE465A19A7200300AF29F1 /* libcurl.a */; };
15EFA25B198A4A47000C57D3 /* libluacocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA258198A4A24000C57D3 /* libluacocos2d Mac.a */; };
15EFA270198B25B9000C57D3 /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; };
15EFA273198B265A000C57D3 /* libluacocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA258198A4A24000C57D3 /* libluacocos2d Mac.a */; };
@ -97,7 +94,6 @@
15EFA68D198B3AD8000C57D3 /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA665198B33EE000C57D3 /* libluacocos2d iOS.a */; };
1A0EE2A218CDF6DA004CD58F /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; };
1A0EE2A518CDF6DA004CD58F /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; };
1A0EE2A618CDF6DA004CD58F /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; };
1A0EE2A718CDF6DA004CD58F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; };
1A0EE2A818CDF6DA004CD58F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; };
1A0EE2A918CDF6DA004CD58F /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482C165F3988007D4F18 /* AudioToolbox.framework */; };
@ -106,7 +102,6 @@
1A0EE2AC18CDF6DA004CD58F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64826165F394E007D4F18 /* QuartzCore.framework */; };
1A0EE2AD18CDF6DA004CD58F /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64824165F3934007D4F18 /* OpenGL.framework */; };
1A0EE2AE18CDF6DA004CD58F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; };
1A0EE2C918CDF733004CD58F /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; };
1A0EE2CA18CDF733004CD58F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA36018CD9AC00087CE3A /* libz.dylib */; };
1A0EE2CB18CDF733004CD58F /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; };
1A0EE2CC18CDF733004CD58F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA28B18CD91510087CE3A /* Foundation.framework */; };
@ -143,7 +138,6 @@
1A221C9D191771E400FD2BE4 /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; };
1A97AC001A1DC3E30076D9CC /* PerformanceMathTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A97ABFE1A1DC3E30076D9CC /* PerformanceMathTest.cpp */; };
1A97AC011A1DC3E30076D9CC /* PerformanceMathTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A97ABFE1A1DC3E30076D9CC /* PerformanceMathTest.cpp */; };
1A9F808D177E98A600D9A1CB /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; };
1AAF534D180E2F4E000584C8 /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; };
1AAF5400180E39D4000584C8 /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; };
1ABCA28718CD91510087CE3A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; };
@ -157,7 +151,6 @@
1ABCA35E18CD9AA50087CE3A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA28B18CD91510087CE3A /* Foundation.framework */; };
1ABCA35F18CD9AAE0087CE3A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; };
1ABCA36118CD9AC00087CE3A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA36018CD9AC00087CE3A /* libz.dylib */; };
1ABCA36218CD9AC60087CE3A /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; };
1ABCA39D18CD9ED80087CE3A /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39C18CD9ED80087CE3A /* AVFoundation.framework */; };
1ABCA39F18CD9EE50087CE3A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39E18CD9EE50087CE3A /* UIKit.framework */; };
1ABCA3A118CD9EF60087CE3A /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A018CD9EF60087CE3A /* OpenGLES.framework */; };
@ -1783,7 +1776,6 @@
files = (
1A0EE2A218CDF6DA004CD58F /* libcocos2d Mac.a in Frameworks */,
1A0EE2A518CDF6DA004CD58F /* IOKit.framework in Frameworks */,
1A0EE2A618CDF6DA004CD58F /* libcurl.dylib in Frameworks */,
1A0EE2A718CDF6DA004CD58F /* libz.dylib in Frameworks */,
1A0EE2A818CDF6DA004CD58F /* Foundation.framework in Frameworks */,
1A0EE2A918CDF6DA004CD58F /* AudioToolbox.framework in Frameworks */,
@ -1801,7 +1793,6 @@
files = (
15EFA270198B25B9000C57D3 /* libcocos2d Mac.a in Frameworks */,
15EFA25B198A4A47000C57D3 /* libluacocos2d Mac.a in Frameworks */,
1A0EE2C918CDF733004CD58F /* libcurl.dylib in Frameworks */,
1A0EE2CA18CDF733004CD58F /* libz.dylib in Frameworks */,
1A0EE2CB18CDF733004CD58F /* IOKit.framework in Frameworks */,
1A0EE2CC18CDF733004CD58F /* Foundation.framework in Frameworks */,
@ -1836,7 +1827,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
15AE17DB19A7235300C27E9E /* libcurl.a in Frameworks */,
15EFA68B198B3AD8000C57D3 /* libcocos2d iOS.a in Frameworks */,
15EFA68D198B3AD8000C57D3 /* libluacocos2d iOS.a in Frameworks */,
15AECE25195D467D00907DB0 /* MediaPlayer.framework in Frameworks */,
@ -1859,7 +1849,6 @@
files = (
15EFA273198B265A000C57D3 /* libluacocos2d Mac.a in Frameworks */,
1ABCA2C318CD92420087CE3A /* libcocos2d Mac.a in Frameworks */,
1ABCA36218CD9AC60087CE3A /* libcurl.dylib in Frameworks */,
1ABCA36118CD9AC00087CE3A /* libz.dylib in Frameworks */,
1ABCA35F18CD9AAE0087CE3A /* IOKit.framework in Frameworks */,
1ABCA35E18CD9AA50087CE3A /* Foundation.framework in Frameworks */,
@ -1877,7 +1866,6 @@
buildActionMask = 2147483647;
files = (
52B47A351A53A43A004E4C60 /* Security.framework in Frameworks */,
15AE17DC19A725A000C27E9E /* libcurl.a in Frameworks */,
15EFA66F198B356E000C57D3 /* libluacocos2d iOS.a in Frameworks */,
15EFA666198B34D7000C57D3 /* libcocos2d iOS.a in Frameworks */,
15AECE0B195C0F8A00907DB0 /* MediaPlayer.framework in Frameworks */,
@ -1900,7 +1888,6 @@
files = (
1AAF534D180E2F4E000584C8 /* libcocos2d Mac.a in Frameworks */,
EDCC747F17C455FD007B692C /* IOKit.framework in Frameworks */,
1A9F808D177E98A600D9A1CB /* libcurl.dylib in Frameworks */,
15C6482F165F399D007D4F18 /* libz.dylib in Frameworks */,
15C64833165F3AFD007D4F18 /* Foundation.framework in Frameworks */,
15C6482D165F3988007D4F18 /* AudioToolbox.framework in Frameworks */,
@ -1936,7 +1923,6 @@
buildActionMask = 2147483647;
files = (
52B47A341A534B2B004E4C60 /* Security.framework in Frameworks */,
15EE465B19A7200300AF29F1 /* libcurl.a in Frameworks */,
3EA0FB66191B933000B170C8 /* MediaPlayer.framework in Frameworks */,
1AAF5400180E39D4000584C8 /* libcocos2d iOS.a in Frameworks */,
D60AE43417F7FFE100757E4B /* CoreMotion.framework in Frameworks */,

4
extensions/assets-manager/Downloader.cpp
View File

@ -36,6 +36,7 @@ NS_CC_EXT_BEGIN
#define MAX_REDIRS 2
#define DEFAULT_TIMEOUT 5
#define HTTP_CODE_SUPPORT_RESUME 206
#define MAX_WAIT_MSECS 30*1000 /* Wait max. 30 seconds */
#define TEMP_EXT ".temp"
@ -626,8 +627,7 @@ void Downloader::groupBatchDownload(const DownloadUnits &units)
FD_ZERO(&fdread);
FD_ZERO(&fdwrite);
FD_ZERO(&fdexcep);
curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
rc = select(maxfd + 1, &fdread, &fdwrite, &fdexcep, &select_tv);
rc = curl_multi_wait(multi_handle,nullptr, 0, MAX_WAIT_MSECS, &maxfd);
switch(rc)
{

2
external/config.json vendored
View File

@ -1,5 +1,5 @@
{
"version":"v3-deps-29",
"version":"v3-deps-30",
"zip_file_size":"87419231",
"repo_name":"cocos2d-x-3rd-party-libs-bin",
"repo_parent":"https://github.com/cocos2d/",

4
templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
View File

@ -29,7 +29,6 @@
503AE10117EB989F00D1A890 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 503AE0FC17EB989F00D1A890 /* main.m */; };
503AE10217EB989F00D1A890 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503AE0FF17EB989F00D1A890 /* RootViewController.mm */; };
503AE10517EB98FF00D1A890 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 503AE10317EB98FF00D1A890 /* main.cpp */; };
503AE11217EB99EE00D1A890 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 503AE11117EB99EE00D1A890 /* libcurl.dylib */; };
503AE11B17EB9C5A00D1A890 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 503AE11A17EB9C5A00D1A890 /* IOKit.framework */; };
5087E76317EB910900C73F5D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
5087E76717EB910900C73F5D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BF170DB412928DE900B8313A /* libz.dylib */; };
@ -106,7 +105,7 @@
1D6058910D05DD3D006BFB54 /* HelloCpp iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloCpp iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
3EACC98E19EE6D4300EB3C5E /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "res"; sourceTree = "<group>"; };
3EACC98E19EE6D4300EB3C5E /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; path = res; sourceTree = "<group>"; };
46880B7619C43A67006E1F66 /* CloseNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseNormal.png; sourceTree = "<group>"; };
46880B7719C43A67006E1F66 /* CloseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseSelected.png; sourceTree = "<group>"; };
46880B7A19C43A67006E1F66 /* HelloWorld.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = HelloWorld.png; sourceTree = "<group>"; };
@ -182,7 +181,6 @@
buildActionMask = 2147483647;
files = (
1AC6FB21180E996B004C840B /* libcocos2d Mac.a in Frameworks */,
503AE11217EB99EE00D1A890 /* libcurl.dylib in Frameworks */,
5087E76717EB910900C73F5D /* libz.dylib in Frameworks */,
503AE11B17EB9C5A00D1A890 /* IOKit.framework in Frameworks */,
5087E78B17EB975400C73F5D /* OpenGL.framework in Frameworks */,

2
templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
View File

@ -12,7 +12,6 @@
15427C78198F1F9900DC375D /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4171834BDA200142BE0 /* libcocos2d Mac.a */; };
15427C79198F1FA200DC375D /* libluacocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C49198F1DE400DC375D /* libluacocos2d Mac.a */; };
15A8A4491834C64F00142BE0 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810C17EBBCAC00990C9B /* Icon-114.png */; };
15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4871834C90E00142BE0 /* libcurl.dylib */; };
15AECE29195D482800907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15AECE28195D482800907DB0 /* MediaPlayer.framework */; };
1AF4C403178663F200122817 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C402178663F200122817 /* libz.dylib */; };
5023811817EBBCAC00990C9B /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5023810817EBBCAC00990C9B /* AppController.mm */; };
@ -188,7 +187,6 @@
files = (
15427C79198F1FA200DC375D /* libluacocos2d Mac.a in Frameworks */,
15427C78198F1F9900DC375D /* libcocos2d Mac.a in Frameworks */,
15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */,
50D7C97017EBBEEC005D0B91 /* IOKit.framework in Frameworks */,
50D7C96E17EBBEE6005D0B91 /* AppKit.framework in Frameworks */,
50D7C96C17EBBEDF005D0B91 /* OpenGL.framework in Frameworks */,