diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index 029c9f0148..c7f37a1699 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -1894,6 +1894,10 @@ A05DCF9D1B90584E00EE040B /* CCDownloader-curl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A05DCF9B1B90584E00EE040B /* CCDownloader-curl.cpp */; }; A05DCF9E1B90584E00EE040B /* CCDownloader-curl.h in Headers */ = {isa = PBXBuildFile; fileRef = A05DCF9C1B90584E00EE040B /* CCDownloader-curl.h */; }; A07A4CAF1783777C0073F6A7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1551A342158F2AB200E66CFE /* Foundation.framework */; }; + A0E749F71BA8FD7F001A8332 /* UIEditBoxImpl-common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A0E749F51BA8FD7F001A8332 /* UIEditBoxImpl-common.cpp */; }; + A0E749F81BA8FD7F001A8332 /* UIEditBoxImpl-common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A0E749F51BA8FD7F001A8332 /* UIEditBoxImpl-common.cpp */; }; + A0E749F91BA8FD7F001A8332 /* UIEditBoxImpl-common.h in Headers */ = {isa = PBXBuildFile; fileRef = A0E749F61BA8FD7F001A8332 /* UIEditBoxImpl-common.h */; }; + A0E749FA1BA8FD7F001A8332 /* UIEditBoxImpl-common.h in Headers */ = {isa = PBXBuildFile; fileRef = A0E749F61BA8FD7F001A8332 /* UIEditBoxImpl-common.h */; }; B2165EEA19921124000BE3E6 /* CCPrimitiveCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B257B45E198A353E00D9A687 /* CCPrimitiveCommand.cpp */; }; B217703C1977ECB4009EE11B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B217703B1977ECB4009EE11B /* IOKit.framework */; }; B21770401977ECE6009EE11B /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B217703F1977ECE6009EE11B /* OpenGL.framework */; }; @@ -4683,6 +4687,8 @@ A05DCF9B1B90584E00EE040B /* CCDownloader-curl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "CCDownloader-curl.cpp"; sourceTree = ""; }; A05DCF9C1B90584E00EE040B /* CCDownloader-curl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCDownloader-curl.h"; sourceTree = ""; }; A07A4D641783777C0073F6A7 /* libcocos2d iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2d iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + A0E749F51BA8FD7F001A8332 /* UIEditBoxImpl-common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "UIEditBoxImpl-common.cpp"; sourceTree = ""; }; + A0E749F61BA8FD7F001A8332 /* UIEditBoxImpl-common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIEditBoxImpl-common.h"; sourceTree = ""; }; B20564AA1A6E5744001C1B6E /* ccShader_PositionColorTextureAsPointsize.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionColorTextureAsPointsize.vert; sourceTree = ""; }; B217703B1977ECB4009EE11B /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; B217703D1977ECC1009EE11B /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; @@ -6832,6 +6838,8 @@ 292DB12E19B4574100A80320 /* UIEditBox */ = { isa = PBXGroup; children = ( + A0E749F51BA8FD7F001A8332 /* UIEditBoxImpl-common.cpp */, + A0E749F61BA8FD7F001A8332 /* UIEditBoxImpl-common.h */, 50ED2BDC19BEAF7900A0AB90 /* UIEditBoxImpl-win32.h */, 50ED2BDE19BEAF7900A0AB90 /* UIEditBoxImpl-win32.cpp */, 292DB12F19B4574100A80320 /* UIEditBox.cpp */, @@ -9909,6 +9917,7 @@ 50ABBE2F1925AB6F00A911A9 /* ccConfig.h in Headers */, 15AE188019AAD33D00C27E9E /* CCBMemberVariableAssigner.h in Headers */, 1AAF5851180E40B9000584C8 /* LocalStorage.h in Headers */, + A0E749F91BA8FD7F001A8332 /* UIEditBoxImpl-common.h in Headers */, 1A01C69018F57BE800EFE3A6 /* CCDictionary.h in Headers */, B6CAB4ED1AF9AA1A00B9B856 /* vectormath2bullet.h in Headers */, 1A9DCA29180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */, @@ -10061,6 +10070,7 @@ B6CAB3BA1AF9AA1A00B9B856 /* btGeneric6DofConstraint.h in Headers */, B6CAB2F81AF9AA1A00B9B856 /* btTriangleBuffer.h in Headers */, 15AE1A4A19AAD3D500C27E9E /* b2CircleShape.h in Headers */, + A0E749FA1BA8FD7F001A8332 /* UIEditBoxImpl-common.h in Headers */, B6CAB2A61AF9AA1A00B9B856 /* btConvexHullShape.h in Headers */, 50ABBE861925AB6F00A911A9 /* ccFPSImages.h in Headers */, B6CAB2BE1AF9AA1A00B9B856 /* btCylinderShape.h in Headers */, @@ -11455,6 +11465,7 @@ B6CAB3591AF9AA1A00B9B856 /* gim_memory.cpp in Sources */, A045F6DC1BA816A1005076C7 /* CCCameraBackgroundBrush.cpp in Sources */, B665E25A1AA80A6500DDB1C5 /* CCPUDoEnableComponentEventHandler.cpp in Sources */, + A0E749F71BA8FD7F001A8332 /* UIEditBoxImpl-common.cpp in Sources */, A045F6E41BA8170A005076C7 /* CCComponentPhysics2d.cpp in Sources */, B6DD2FB31B04825B00E47F5F /* RecastDump.cpp in Sources */, B6CAB2BB1AF9AA1A00B9B856 /* btCylinderShape.cpp in Sources */, @@ -12242,6 +12253,7 @@ 15AE1B7219AADA9A00C27E9E /* UIListView.cpp in Sources */, 1A5701BE180BCB5A0088DEC7 /* CCLabelAtlas.cpp in Sources */, 15FB20751AE7BF8600C31518 /* CCAutoPolygon.cpp in Sources */, + A0E749F81BA8FD7F001A8332 /* UIEditBoxImpl-common.cpp in Sources */, B6CAB2021AF9AA1A00B9B856 /* btMultiSapBroadphase.cpp in Sources */, 15AE1A3D19AAD3D500C27E9E /* b2CollideEdge.cpp in Sources */, 1A5701C2180BCB5A0088DEC7 /* CCLabelBMFont.cpp in Sources */, diff --git a/cocos/network/CMakeLists.txt b/cocos/network/CMakeLists.txt index a2079a9921..6c461736d9 100644 --- a/cocos/network/CMakeLists.txt +++ b/cocos/network/CMakeLists.txt @@ -13,7 +13,7 @@ set(COCOS_NETWORK_SRC network/SocketIO.cpp network/WebSocket.cpp network/CCDownloader.cpp - network/CCDownloaderImpl.cpp + network/CCDownloader-curl.cpp ) if(MSVC) diff --git a/cocos/platform/android/java/libs/android-async-http-1.4.8.jar b/cocos/platform/android/java/libs/android-async-http-1.4.8.jar new file mode 100644 index 0000000000..74664cca13 Binary files /dev/null and b/cocos/platform/android/java/libs/android-async-http-1.4.8.jar differ