diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id index 8088b36f0b..df0f90e563 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -bbf0323293cba3d7ee58ef36706831a8761692d8 \ No newline at end of file +b8986c04c89d3861f82fb99b0df633ac2cc4a13c \ No newline at end of file diff --git a/external/curl/include/ios/curl/curlbuild.h b/external/curl/include/ios/curl/curlbuild.h index c24099a90a..3397c39b61 100644 --- a/external/curl/include/ios/curl/curlbuild.h +++ b/external/curl/include/ios/curl/curlbuild.h @@ -171,13 +171,13 @@ typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t; typedef CURL_TYPEOF_CURL_OFF_T curl_off_t; /* curl_off_t formatting string directive without "%" conversion specifier. */ -#define CURL_FORMAT_CURL_OFF_T "lld" +#define CURL_FORMAT_CURL_OFF_T PRId64 /* unsigned curl_off_t formatting string without "%" conversion specifier. */ -#define CURL_FORMAT_CURL_OFF_TU "llu" +#define CURL_FORMAT_CURL_OFF_TU PRIu64 /* curl_off_t formatting string directive with "%" conversion specifier. */ -#define CURL_FORMAT_OFF_T "%lld" +#define CURL_FORMAT_OFF_T "%" PRId64 /* The size of `curl_off_t', as computed by sizeof. */ #define CURL_SIZEOF_CURL_OFF_T 8 diff --git a/external/curl/prebuilt/ios/libcurl.a.REMOVED.git-id b/external/curl/prebuilt/ios/libcurl.a.REMOVED.git-id index a3971cdd23..b832ed4fb2 100644 --- a/external/curl/prebuilt/ios/libcurl.a.REMOVED.git-id +++ b/external/curl/prebuilt/ios/libcurl.a.REMOVED.git-id @@ -1 +1 @@ -c135286e812602cc184684b59b4d074f723ef4a5 \ No newline at end of file +dc1d98e73cda98024add3420a06fa29651c863d0 \ No newline at end of file diff --git a/external/curl/prebuilt/ios/libcurl_arm64.a.REMOVED.git-id b/external/curl/prebuilt/ios/libcurl_arm64.a.REMOVED.git-id new file mode 100644 index 0000000000..709ec42a2a --- /dev/null +++ b/external/curl/prebuilt/ios/libcurl_arm64.a.REMOVED.git-id @@ -0,0 +1 @@ +9b09288998b6198388456c41ccbdd5596622abe5 \ No newline at end of file diff --git a/external/freetype2/prebuilt/ios/libfreetype.a.REMOVED.git-id b/external/freetype2/prebuilt/ios/libfreetype.a.REMOVED.git-id index f7532b4633..6f0e868417 100644 --- a/external/freetype2/prebuilt/ios/libfreetype.a.REMOVED.git-id +++ b/external/freetype2/prebuilt/ios/libfreetype.a.REMOVED.git-id @@ -1 +1 @@ -3303f759eb8c682843322ffa9f8c69563d241ca5 \ No newline at end of file +81b071fde15c160fb96e2b28a22142e903fdf5a4 \ No newline at end of file diff --git a/external/freetype2/prebuilt/ios/libfreetype_arm64.a.REMOVED.git-id b/external/freetype2/prebuilt/ios/libfreetype_arm64.a.REMOVED.git-id new file mode 100644 index 0000000000..5bae8cd871 --- /dev/null +++ b/external/freetype2/prebuilt/ios/libfreetype_arm64.a.REMOVED.git-id @@ -0,0 +1 @@ +690402fd689da9d29621e7665db2f40ac4e947eb \ No newline at end of file diff --git a/external/jpeg/prebuilt/ios/libjpeg.a.REMOVED.git-id b/external/jpeg/prebuilt/ios/libjpeg.a.REMOVED.git-id index 5434a2f27c..a366f9fbac 100644 --- a/external/jpeg/prebuilt/ios/libjpeg.a.REMOVED.git-id +++ b/external/jpeg/prebuilt/ios/libjpeg.a.REMOVED.git-id @@ -1 +1 @@ -39c4d5970691b3a3ca47be0f7d2a0b5c72e9e2ee \ No newline at end of file +e8281e5ccfc438a1d097b9704010312801ea192e \ No newline at end of file diff --git a/external/jpeg/prebuilt/ios/libjpeg_arm64.a.REMOVED.git-id b/external/jpeg/prebuilt/ios/libjpeg_arm64.a.REMOVED.git-id new file mode 100644 index 0000000000..11f4aa8c76 --- /dev/null +++ b/external/jpeg/prebuilt/ios/libjpeg_arm64.a.REMOVED.git-id @@ -0,0 +1 @@ +dd93f7d77c23392642750b58fb0f41eda9218b69 \ No newline at end of file diff --git a/external/jpeg/prebuilt/mac/libjpeg.a.REMOVED.git-id b/external/jpeg/prebuilt/mac/libjpeg.a.REMOVED.git-id index 78b5e3634d..fdea42a702 100644 --- a/external/jpeg/prebuilt/mac/libjpeg.a.REMOVED.git-id +++ b/external/jpeg/prebuilt/mac/libjpeg.a.REMOVED.git-id @@ -1 +1 @@ -fc2d13f253f62b28ad1d37a4a24da1e977acba20 \ No newline at end of file +d8eeb3fe1c71ca56139f7e31f0b502da876c692b \ No newline at end of file diff --git a/external/png/prebuilt/ios/libpng.a.REMOVED.git-id b/external/png/prebuilt/ios/libpng.a.REMOVED.git-id index adbc13a75d..2d0321bd96 100644 --- a/external/png/prebuilt/ios/libpng.a.REMOVED.git-id +++ b/external/png/prebuilt/ios/libpng.a.REMOVED.git-id @@ -1 +1 @@ -2a8128e7d552dc8b2d79c1cbd8c84c21ad578672 \ No newline at end of file +c4decf3cb39b46189df24c54868f46e985b15de2 \ No newline at end of file diff --git a/external/png/prebuilt/ios/libpng_arm64.a.REMOVED.git-id b/external/png/prebuilt/ios/libpng_arm64.a.REMOVED.git-id new file mode 100644 index 0000000000..9907c43b6c --- /dev/null +++ b/external/png/prebuilt/ios/libpng_arm64.a.REMOVED.git-id @@ -0,0 +1 @@ +13d38a8f7cf04ee464b3eaf5fd7464853499390e \ No newline at end of file diff --git a/external/png/prebuilt/mac/libpng.a.REMOVED.git-id b/external/png/prebuilt/mac/libpng.a.REMOVED.git-id index 9d858ddb88..a3f9f5fe04 100644 --- a/external/png/prebuilt/mac/libpng.a.REMOVED.git-id +++ b/external/png/prebuilt/mac/libpng.a.REMOVED.git-id @@ -1 +1 @@ -fb78024e2f81c33d196af83e7740de7c7f4ea021 \ No newline at end of file +373f86ef034bf18f5d52588747c02d7896884730 \ No newline at end of file diff --git a/external/tiff/include/ios/tiffconf.h b/external/tiff/include/ios/tiffconf.h index 4322c323af..9a53f1497b 100644 --- a/external/tiff/include/ios/tiffconf.h +++ b/external/tiff/include/ios/tiffconf.h @@ -15,7 +15,7 @@ #define TIFF_INT32_T signed int /* Signed 64-bit type */ -#define TIFF_INT64_T signed long long +#define TIFF_INT64_T int64_t /* Signed 8-bit type */ #define TIFF_INT8_T signed char @@ -27,7 +27,7 @@ #define TIFF_UINT32_T unsigned int /* Unsigned 64-bit type */ -#define TIFF_UINT64_T unsigned long long +#define TIFF_UINT64_T uint64_t /* Unsigned 8-bit type */ #define TIFF_UINT8_T unsigned char diff --git a/external/tiff/prebuilt/ios/libtiff.a.REMOVED.git-id b/external/tiff/prebuilt/ios/libtiff.a.REMOVED.git-id index 1305bb3f84..75a747bf14 100644 --- a/external/tiff/prebuilt/ios/libtiff.a.REMOVED.git-id +++ b/external/tiff/prebuilt/ios/libtiff.a.REMOVED.git-id @@ -1 +1 @@ -60433133a48054eb884d9e6a0cee95fe4ba22b1c \ No newline at end of file +286c39ddabb05b91c81ee5d7ec0a1301d0be3108 \ No newline at end of file diff --git a/external/tiff/prebuilt/ios/libtiff_arm64.a.REMOVED.git-id b/external/tiff/prebuilt/ios/libtiff_arm64.a.REMOVED.git-id new file mode 100644 index 0000000000..2a9acad1ea --- /dev/null +++ b/external/tiff/prebuilt/ios/libtiff_arm64.a.REMOVED.git-id @@ -0,0 +1 @@ +39aa0b352df6cb1adf2390cf199910b21a3b3c12 \ No newline at end of file diff --git a/external/tiff/prebuilt/mac/libtiff.a.REMOVED.git-id b/external/tiff/prebuilt/mac/libtiff.a.REMOVED.git-id index 4cc30a45bb..89f7a5119a 100644 --- a/external/tiff/prebuilt/mac/libtiff.a.REMOVED.git-id +++ b/external/tiff/prebuilt/mac/libtiff.a.REMOVED.git-id @@ -1 +1 @@ -5fe8aca7e0bfa91c79b4b6b0a562f88a6653c452 \ No newline at end of file +e5cd88ead5723950d6f69e8bd72b4b18b2f9d893 \ No newline at end of file diff --git a/external/version.txt b/external/version.txt new file mode 100644 index 0000000000..bdd7244465 --- /dev/null +++ b/external/version.txt @@ -0,0 +1,9 @@ +libs version +——————————————————— +freetype 2.5.0 +curl 7.26.0 +jpeg 9.0 +png 1.6.2 +tiff 4.0.3 +webp 0.2.1 +websockets v1.23-chrome32-firefox24 \ No newline at end of file diff --git a/external/webp/prebuilt/ios/libwebp.a.REMOVED.git-id b/external/webp/prebuilt/ios/libwebp.a.REMOVED.git-id index f782a7af53..46ccff2586 100644 --- a/external/webp/prebuilt/ios/libwebp.a.REMOVED.git-id +++ b/external/webp/prebuilt/ios/libwebp.a.REMOVED.git-id @@ -1 +1 @@ -c26c3c22887023d322926dcbbd0f69377deedaf8 \ No newline at end of file +7f9f32e81cbd068ab7a9c408a26eedfdcc8d6e30 \ No newline at end of file diff --git a/external/webp/prebuilt/ios/libwebp_arm64.a.REMOVED.git-id b/external/webp/prebuilt/ios/libwebp_arm64.a.REMOVED.git-id new file mode 100644 index 0000000000..c5dff9b151 --- /dev/null +++ b/external/webp/prebuilt/ios/libwebp_arm64.a.REMOVED.git-id @@ -0,0 +1 @@ +904e2e16f2f4846b4550b9ba25e8b709f6c4337e \ No newline at end of file diff --git a/external/webp/prebuilt/mac/libwebp.a.REMOVED.git-id b/external/webp/prebuilt/mac/libwebp.a.REMOVED.git-id index 7a441fa135..fb37e15f1a 100644 --- a/external/webp/prebuilt/mac/libwebp.a.REMOVED.git-id +++ b/external/webp/prebuilt/mac/libwebp.a.REMOVED.git-id @@ -1 +1 @@ -4c5c7d34a90f5fcac954f6d44803173224d8ead2 \ No newline at end of file +6b5decfe3f5b19bacfbd9778cb58843a7161a6a9 \ No newline at end of file diff --git a/external/websockets/prebuilt/ios/libwebsockets.a.REMOVED.git-id b/external/websockets/prebuilt/ios/libwebsockets.a.REMOVED.git-id index 08dc34e960..51c418cdb9 100644 --- a/external/websockets/prebuilt/ios/libwebsockets.a.REMOVED.git-id +++ b/external/websockets/prebuilt/ios/libwebsockets.a.REMOVED.git-id @@ -1 +1 @@ -ee4ee6cc26274f6d3138d08d429d6ba49b629f53 \ No newline at end of file +5c60f0b27edd2650caee8a96948272604a8098d5 \ No newline at end of file diff --git a/external/websockets/prebuilt/mac/libwebsockets.a.REMOVED.git-id b/external/websockets/prebuilt/mac/libwebsockets.a.REMOVED.git-id index bdf504bf24..0badadb7b2 100644 --- a/external/websockets/prebuilt/mac/libwebsockets.a.REMOVED.git-id +++ b/external/websockets/prebuilt/mac/libwebsockets.a.REMOVED.git-id @@ -1 +1 @@ -5d0743ce07a9c865d4367d8e3db161148676f2c8 \ No newline at end of file +36c2d4cb652d9a93fa2a285cb8c73f237612bb46 \ No newline at end of file