cocos2d-x-3rd-party-libs-src (v3-deps-161) を bitcode 有効にしてビルド

cocos2d-x の v3 ブランチ の external を bitcode 有効にしてビルド

# 環境

1. macOS 10.15.4 (英語)
2. Xcode 11.5

# 手順

1. [cocos2d-x-3rd-party-libs-src](https://github.com/cocos2d/cocos2d-x-3rd-party-libs-src) を git clone
 
		$ git clone https://github.com/cocos2d/cocos2d-x-3rd-party-libs-src.git
		Cloning into 'cocos2d-x-3rd-party-libs-src'...
		remote: Enumerating objects: 2700, done.
		remote: Total 2700 (delta 0), reused 0 (delta 0), pack-reused 2700
		Receiving objects: 100% (2700/2700), 515.98 KiB | 517.00 KiB/s, done.
		Resolving deltas: 100% (1463/1463), done.
		$ cd cocos2d-x-3rd-party-libs-src

2. v3 ブランチ用に git checkout

    1. 2020-05-31 時点で cocos2d-x の v3 ブランチの external のバージョンは [v3-deps-172](https://github.com/cocos2d/cocos2d-x/blob/v3/external/config.json#L2) ([2019-11-08](https://github.com/cocos2d/cocos2d-x-3rd-party-libs-bin/releases/tag/v3-deps-172))
    1. cocos2d-x-3rd-party-libs-src の最終コミットは [2019-07-26](https://github.com/cocos2d/cocos2d-x-3rd-party-libs-src/commits/v3) で
    1. cocos2d-x-3rd-party-libs-bin の [v3-deps-161](https://github.com/cocos2d/cocos2d-x-3rd-party-libs-bin/releases/tag/v3-deps-161) (2019-08-20) より古い
        1. cocos2d-x-3rd-party-libs-bin をビルドしたソースが cocos2d-x-3rd-party-libs-src にコミットされてなさそう
    1. [cocos2d-x-external](https://github.com/cocos2d/cocos2d-x-external/commits/master) レポジトリはコミットメッセージ ( [remove tiff](https://github.com/cocos2d/cocos2d-x-external/commit/8425af2d9296a4900c0ad1ab79a8084f71d8eae1) ）から metal 用と思われる
    1. 仕方がないので cocos2d-x-3rd-party-libs-src の最終コミット（コミットメッセージ `update luajit` から `v3-deps-161` と思われる）をビルド

3. README.md に従ってビルド用のツールをインストール

		$ brew update
		$ brew install cmake
		$ brew install autoconf
		$ brew install automake
		$ brew install libtool
		$ brew list --versions
		autoconf 2.69
		automake 1.16.2
		cmake 3.17.3
		git 2.16.1
		libtool 2.4.6_1

    1. `git` は `/usr/bin/git` (`2.24.3 (Apple Git-128)`)をそのまま使った

4. README.md に従って bitcode を有効に

    1. build/ios.ini の

            cfg_build_bitcode=
         を

            cfg_build_bitcode="-fembed-bitcode"
         に変更

    2. また curl でビルドエラーが出るので

			connect.c:1087:12: error: 'connectx' is only available on iOS 9.0 or newer [-Werror,-Wunguarded-availability]
			      rc = connectx(sockfd, &endpoints, SAE_ASSOCID_ANY,
			           ^~~~~~~~
			/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.5.sdk/usr/include/sys/socket.h:723:5: note: 'connectx' has been marked as being introduced in iOS 9.0 here, but the deployment target is
			      iOS 7.0.0
			int connectx(int, const sa_endpoints_t *, sae_associd_t, unsigned int,
			    ^
			connect.c:1087:12: note: enclose 'connectx' in a __builtin_available check to silence this warning
			      rc = connectx(sockfd, &endpoints, SAE_ASSOCID_ANY,
			           ^~~~~~~~
			1 error generated.
			make[2]: *** [libcurl_la-connect.lo] Error 1

		1. contrib/bootstrap 内の `-miphoneos-version-min=7.0` を `-miphoneos-version-min=10.0` に置換（ 3 箇所）

5. iOS 用に release ビルド

		$ cd build
		$ ./build.sh -p=ios --libs=png,zlib,websockets,curl,freetype,jpeg,tiff,webp,chipmunk,openssl,bullet,box2d,uv --arch=all

	1. `--libs=all` だと lua でビルドエラーが起きる
	
			loslib.c:39:22: error: 'system' is unavailable: not available on iOS
			  lua_pushinteger(L, system(luaL_optstring(L, 1, NULL)));
	
	1. `rapidjson` を指定するとビルドエラーが起きる

			checking rapidjson is in png zlib lua luajit websockets curl freetype jpeg tiff webp chipmunk openssl rapidjson, bullet box2d uv glsl_optimizer
			Invalid library names! Only png zlib lua luajit websockets curl freetype jpeg tiff webp chipmunk openssl rapidjson, bullet box2d uv glsl_optimizer is acceptable!

	1. `glsl_optimizer` は `cocos2d-x/external` に存在しないのでビルドしない

	1. また bullet の i386 と x86_64 で[ビルドエラー](https://github.com/bulletphysics/bullet3/issues/2418)が出るので

			In file included from /Users/kenichi/foo/cocos2d-x-3rd-party-libs-src/contrib/ios-i386/bullet/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp:20:
			In file included from /Users/kenichi/foo/cocos2d-x-3rd-party-libs-src/contrib/ios-i386/bullet/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h:22:
			/Users/kenichi/foo/cocos2d-x-3rd-party-libs-src/contrib/ios-i386/bullet/src/LinearMath/btVector3.h:330:7: error: argument value 10880 is outside the valid range [0, 255] [-Wargument-outside-range]
			                y = bt_splat_ps(y, 0x80);
			                    ^~~~~~~~~~~~~~~~~~~~
			/Users/kenichi/foo/cocos2d-x-3rd-party-libs-src/contrib/ios-i386/bullet/src/LinearMath/btVector3.h:46:32: note: expanded from macro 'bt_splat_ps'
			#define bt_splat_ps( _a, _i )  bt_pshufd_ps((_a), BT_SHUFFLE(_i,_i,_i,_i) )
			                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
			/Users/kenichi/foo/cocos2d-x-3rd-party-libs-src/contrib/ios-i386/bullet/src/LinearMath/btVector3.h:44:35: note: expanded from macro 'bt_pshufd_ps'
			#define bt_pshufd_ps( _a, _mask ) _mm_shuffle_ps((_a), (_a), (_mask) )
			                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
			/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/11.0.3/include/xmmintrin.h:2596:11: note: expanded from macro '_mm_shuffle_ps'
			  (__m128)__builtin_ia32_shufps((__v4sf)(__m128)(a), (__v4sf)(__m128)(b), \
			          ^
			In file included from /Users/kenichi/foo/cocos2d-x-3rd-party-libs-src/contrib/ios-i386/bullet/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp:20:
			In file included from /Users/kenichi/foo/cocos2d-x-3rd-party-libs-src/contrib/ios-i386/bullet/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h:27:
			In file included from /Users/kenichi/foo/cocos2d-x-3rd-party-libs-src/contrib/ios-i386/bullet/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h:20:
			In file included from /Users/kenichi/foo/cocos2d-x-3rd-party-libs-src/contrib/ios-i386/bullet/src/BulletCollision/BroadphaseCollision/btDbvt.h:22:
			In file included from /Users/kenichi/foo/cocos2d-x-3rd-party-libs-src/contrib/ios-i386/bullet/src/LinearMath/btTransform.h:21:
			/Users/kenichi/foo/cocos2d-x-3rd-party-libs-src/contrib/ios-i386/bullet/src/LinearMath/btMatrix3x3.h:861:17: error: argument value 10880 is outside the valid range [0, 255] [-Wargument-outside-range]
			    __m128 vk = bt_splat_ps(_mm_load_ss((float *)&k), 0x80);
			                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
			/Users/kenichi/foo/cocos2d-x-3rd-party-libs-src/contrib/ios-i386/bullet/src/LinearMath/btVector3.h:46:32: note: expanded from macro 'bt_splat_ps'
			#define bt_splat_ps( _a, _i )  bt_pshufd_ps((_a), BT_SHUFFLE(_i,_i,_i,_i) )
			                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
			/Users/kenichi/foo/cocos2d-x-3rd-party-libs-src/contrib/ios-i386/bullet/src/LinearMath/btVector3.h:44:35: note: expanded from macro 'bt_pshufd_ps'
			#define bt_pshufd_ps( _a, _mask ) _mm_shuffle_ps((_a), (_a), (_mask) )
			                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
			/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/11.0.3/include/xmmintrin.h:2596:11: note: expanded from macro '_mm_shuffle_ps'
			  (__m128)__builtin_ia32_shufps((__v4sf)(__m128)(a), (__v4sf)(__m128)(b), \
			          ^
			2 errors generated.

		1. 以下のファイルへ [7638b7c](https://github.com/bulletphysics/bullet3/commit/7638b7c5a659dceb4e580ae87d4d60b00847ef94) を適用して再ビルド
			1. contrib/ios-i386/bullet/src/LinearMath/btVector3.h
			1. contrib/ios-x86_64/bullet/src/LinearMath/btVector3.h


# ビルド結果を cocos2d-x の v3 ブランチの external へ配置

	$ git checkout v3
	$ python download-deps.py
	$ cd external

## png

	$ cd png/prebuilt/ios

	$ diff -r ../../include/ios ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/png/include

	$ mv libpng.a libpng.a.dist
	$ cp -p ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/png/prebuilt/libpng.a .

	$ cd ../../..

1. 差異はなかった

## zlib

1. zlib/prebuilt/ios は存在しない

## websockets

	$ cd websockets/prebuilt/ios

	$ diff -r ../../include/ios/libwebsockets.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/websockets/include/libwebsockets.h
	173c173
	< #include "uv.h"
	---
	> #include <uv.h>
	214c214
	< #include "openssl/ssl.h"
	---
	> #include <openssl/ssl.h>
	216c216
	< #include "openssl/err.h"
	---
	> #include <openssl/err.h>
	Only in ../../include/ios: lws_config-arm32.h
	Only in ../../include/ios: lws_config-arm64.h
	Only in ../../include/ios: lws_config-i386.h
	Only in ../../include/ios: lws_config-x86_64.h
	diff -r ../../include/ios/lws_config.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/websockets/include/lws_config.h
	9c9
	< #define LWS_INSTALL_DATADIR "/Users/cocos/Github/cocos2d-x-3rd-party-libs-src/contrib/install-ios/x86_64/share"
	---
	> #define LWS_INSTALL_DATADIR "/Users/kenichi/foo/cocos2d-x-3rd-party-libs-src/contrib/install-ios/x86_64/share"
	38c38
	< #define LWS_BUILD_HASH "cocos@cocoss-MacBook-Pro.local-v3.4-182-g408ba56"
	---
	> #define LWS_BUILD_HASH "kenichi@Kenichis-Mac-Pro.local-v3.4-180-ge438682"

	$ mv libwebsockets.a libwebsockets.a.dist
	$ cp -p ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/websockets/prebuilt/libwebsockets.a .

	$ cd ../../..

1. lws_config-*.h が external にしか存在しないが libwebsockets.h は実質同等
    1. この差異はとりあえず無視
2. lws_config.h の差異は環境の違いだが影響ない筈

## curl (with crypto and ssl)

```
	$ cd curl/prebuilt/ios

	$ diff -rq ../../include/ios ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/curl/include
	Only in ../../include/ios/curl: curlbuild-arm64.h
  Only in ../../include/ios/curl: curlbuild-i386.h
  Only in ../../include/ios/curl: curlbuild-x86_64.h
  Files ../../include/ios/curl/curlbuild.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/curl/include/curl/curlbuild.h differ

	$ cat ../../include/ios/curl/curlbuild.h
  #ifdef __arm64__
  #include "curlbuild-arm64.h"
  #elif __arm__
  #include "curlbuild-arm32.h"
  #elif __i386__
  #include "curlbuild-i386.h"
  #elif __x86_64__
  #include "curlbuild-x86_64.h"
  #else
  #error "Unsupported architecture!"
  #endif

	$ diff ../../include/ios/curl/curlbuild-arm64.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/curl/include/curl/curlbuild.h
	$ diff ../../include/ios/curl/curlbuild-arm32.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/curl/include/curl/curlbuild.h
  136c136
  < #define CURL_PULL_STDINT_H 1
  ---
  > /* #undef CURL_PULL_STDINT_H */
  143c143
  < #define CURL_PULL_INTTYPES_H 1
  ---
  > /* #undef CURL_PULL_INTTYPES_H */
  163c163
  < #define CURL_SIZEOF_LONG 4
  ---
  > #define CURL_SIZEOF_LONG 8
  175c175
  < #define CURL_TYPEOF_CURL_OFF_T int64_t
  ---
  > #define CURL_TYPEOF_CURL_OFF_T long
  181c181
  < #define CURL_FORMAT_CURL_OFF_T "lld"
  ---
  > #define CURL_FORMAT_CURL_OFF_T "ld"
  184c184
  < #define CURL_FORMAT_CURL_OFF_TU "llu"
  ---
  > #define CURL_FORMAT_CURL_OFF_TU "lu"
  187c187
  < #define CURL_FORMAT_OFF_T "%lld"
  ---
  > #define CURL_FORMAT_OFF_T "%ld"
  193c193
  < #define CURL_SUFFIX_CURL_OFF_T LL
  ---
  > #define CURL_SUFFIX_CURL_OFF_T L
  196c196
  < #define CURL_SUFFIX_CURL_OFF_TU ULL
  ---
  > #define CURL_SUFFIX_CURL_OFF_TU UL
	$ diff ../../include/ios/curl/curlbuild-i386.h ../../include/ios/curl/curlbuild-arm32.h
	$ diff ../../include/ios/curl/curlbuild-x86_64.h ../../include/ios/curl/curlbuild-arm64.h

	$ mv libcurl.a libcurl.a.dist
	$ cp -p ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/curl/prebuilt/libcurl.a .

	$ cd ../../..
```

1. [external の curlbuild.h](https://github.com/cocos2d/cocos2d-x-3rd-party-libs-bin/blob/v3/curl/include/ios/curl/curlbuild.h) は他のファイルを読み込んでおり、64 ビット用は元のファイルと同一
    1. この差異もとりあえず無視

## freetype

	$ cd freetype2/prebuilt/ios

	$ diff -r ../../include/ios ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include
	diff -r ../../include/ios/freetype2/config/ftconfig.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/config/ftconfig.h
	41c41
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/config/ftheader.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/config/ftheader.h
	24c24
	<   /* "Macro"                                                               */
	---
	>   /* <Macro>                                                               */
	27c27
	<   /* "Description"                                                         */
	---
	>   /* <Description>                                                         */
	42c42
	<   /* "Macro"                                                               */
	---
	>   /* <Macro>                                                               */
	45c45
	<   /* "Description"                                                         */
	---
	>   /* <Description>                                                         */
	66c66
	<   /* "Section"                                                             */
	---
	>   /* <Section>                                                             */
	69c69
	<   /* "Title"                                                               */
	---
	>   /* <Title>                                                               */
	72c72
	<   /* "Abstract"                                                            */
	---
	>   /* <Abstract>                                                            */
	75c75
	<   /* "Description"                                                         */
	---
	>   /* <Description>                                                         */
	110c110
	< #define FT_CONFIG_CONFIG_H  "config/ftconfig.h"
	---
	> #define FT_CONFIG_CONFIG_H  <config/ftconfig.h>
	125c125
	< #define FT_CONFIG_STANDARD_LIBRARY_H  "config/ftstdlib.h"
	---
	> #define FT_CONFIG_STANDARD_LIBRARY_H  <config/ftstdlib.h>
	140c140
	< #define FT_CONFIG_OPTIONS_H  "config/ftoption.h"
	---
	> #define FT_CONFIG_OPTIONS_H  <config/ftoption.h>
	156c156
	< #define FT_CONFIG_MODULES_H  "config/ftmodule.h"
	---
	> #define FT_CONFIG_MODULES_H  <config/ftmodule.h>
	173c173
	< #define FT_FREETYPE_H  "freetype.h"
	---
	> #define FT_FREETYPE_H  <freetype.h>
	188c188
	< #define FT_ERRORS_H  "fterrors.h"
	---
	> #define FT_ERRORS_H  <fterrors.h>
	201c201
	< #define FT_MODULE_ERRORS_H  "ftmoderr.h"
	---
	> #define FT_MODULE_ERRORS_H  <ftmoderr.h>
	217c217
	< #define FT_SYSTEM_H  "ftsystem.h"
	---
	> #define FT_SYSTEM_H  <ftsystem.h>
	233c233
	< #define FT_IMAGE_H  "ftimage.h"
	---
	> #define FT_IMAGE_H  <ftimage.h>
	248c248
	< #define FT_TYPES_H  "fttypes.h"
	---
	> #define FT_TYPES_H  <fttypes.h>
	263c263
	< #define FT_LIST_H  "ftlist.h"
	---
	> #define FT_LIST_H  <ftlist.h>
	276c276
	< #define FT_OUTLINE_H  "ftoutln.h"
	---
	> #define FT_OUTLINE_H  <ftoutln.h>
	289c289
	< #define FT_SIZES_H  "ftsizes.h"
	---
	> #define FT_SIZES_H  <ftsizes.h>
	302c302
	< #define FT_MODULE_H  "ftmodapi.h"
	---
	> #define FT_MODULE_H  <ftmodapi.h>
	315c315
	< #define FT_RENDER_H  "ftrender.h"
	---
	> #define FT_RENDER_H  <ftrender.h>
	328c328
	< #define FT_AUTOHINTER_H  "ftautoh.h"
	---
	> #define FT_AUTOHINTER_H  <ftautoh.h>
	341c341
	< #define FT_CFF_DRIVER_H  "ftcffdrv.h"
	---
	> #define FT_CFF_DRIVER_H  <ftcffdrv.h>
	354c354
	< #define FT_TRUETYPE_DRIVER_H  "ftttdrv.h"
	---
	> #define FT_TRUETYPE_DRIVER_H  <ftttdrv.h>
	367c367
	< #define FT_TYPE1_TABLES_H  "t1tables.h"
	---
	> #define FT_TYPE1_TABLES_H  <t1tables.h>
	382c382
	< #define FT_TRUETYPE_IDS_H  "ttnameid.h"
	---
	> #define FT_TRUETYPE_IDS_H  <ttnameid.h>
	395c395
	< #define FT_TRUETYPE_TABLES_H  "tttables.h"
	---
	> #define FT_TRUETYPE_TABLES_H  <tttables.h>
	409c409
	< #define FT_TRUETYPE_TAGS_H  "tttags.h"
	---
	> #define FT_TRUETYPE_TAGS_H  <tttags.h>
	423c423
	< #define FT_BDF_H  "ftbdf.h"
	---
	> #define FT_BDF_H  <ftbdf.h>
	437c437
	< #define FT_CID_H  "ftcid.h"
	---
	> #define FT_CID_H  <ftcid.h>
	450c450
	< #define FT_GZIP_H  "ftgzip.h"
	---
	> #define FT_GZIP_H  <ftgzip.h>
	463c463
	< #define FT_LZW_H  "ftlzw.h"
	---
	> #define FT_LZW_H  <ftlzw.h>
	476c476
	< #define FT_BZIP2_H  "ftbzip2.h"
	---
	> #define FT_BZIP2_H  <ftbzip2.h>
	489c489
	< #define FT_WINFONTS_H   "ftwinfnt.h"
	---
	> #define FT_WINFONTS_H   <ftwinfnt.h>
	502c502
	< #define FT_GLYPH_H  "ftglyph.h"
	---
	> #define FT_GLYPH_H  <ftglyph.h>
	515c515
	< #define FT_BITMAP_H  "ftbitmap.h"
	---
	> #define FT_BITMAP_H  <ftbitmap.h>
	528c528
	< #define FT_BBOX_H  "ftbbox.h"
	---
	> #define FT_BBOX_H  <ftbbox.h>
	541c541
	< #define FT_CACHE_H  "ftcache.h"
	---
	> #define FT_CACHE_H  <ftcache.h>
	615c615
	< #define FT_MAC_H  "ftmac.h"
	---
	> #define FT_MAC_H  <ftmac.h>
	628c628
	< #define FT_MULTIPLE_MASTERS_H  "ftmm.h"
	---
	> #define FT_MULTIPLE_MASTERS_H  <ftmm.h>
	642c642
	< #define FT_SFNT_NAMES_H  "ftsnames.h"
	---
	> #define FT_SFNT_NAMES_H  <ftsnames.h>
	656c656
	< #define FT_OPENTYPE_VALIDATE_H  "ftotval.h"
	---
	> #define FT_OPENTYPE_VALIDATE_H  <ftotval.h>
	670c670
	< #define FT_GX_VALIDATE_H  "ftgxval.h"
	---
	> #define FT_GX_VALIDATE_H  <ftgxval.h>
	683c683
	< #define FT_PFR_H  "ftpfr.h"
	---
	> #define FT_PFR_H  <ftpfr.h>
	695c695
	< #define FT_STROKER_H  "ftstroke.h"
	---
	> #define FT_STROKER_H  <ftstroke.h>
	707c707
	< #define FT_SYNTHESIS_H  "ftsynth.h"
	---
	> #define FT_SYNTHESIS_H  <ftsynth.h>
	720c720
	< #define FT_XFREE86_H  "ftxf86.h"
	---
	> #define FT_XFREE86_H  <ftxf86.h>
	733c733
	< #define FT_TRIGONOMETRY_H  "fttrigon.h"
	---
	> #define FT_TRIGONOMETRY_H  <fttrigon.h>
	745c745
	< #define FT_LCD_FILTER_H  "ftlcdfil.h"
	---
	> #define FT_LCD_FILTER_H  <ftlcdfil.h>
	757c757
	< #define FT_UNPATENTED_HINTING_H  "ttunpat.h"
	---
	> #define FT_UNPATENTED_HINTING_H  <ttunpat.h>
	769c769
	< #define FT_INCREMENTAL_H  "ftincrem.h"
	---
	> #define FT_INCREMENTAL_H  <ftincrem.h>
	781c781
	< #define FT_GASP_H  "ftgasp.h"
	---
	> #define FT_GASP_H  <ftgasp.h>
	793c793
	< #define FT_ADVANCES_H  "ftadvanc.h"
	---
	> #define FT_ADVANCES_H  <ftadvanc.h>
	798c798
	< #define FT_ERROR_DEFINITIONS_H  "fterrdef.h"
	---
	> #define FT_ERROR_DEFINITIONS_H  <fterrdef.h>
	805,811c805,811
	< #define FT_CACHE_MANAGER_H           "ftcache.h"
	< #define FT_CACHE_INTERNAL_MRU_H      "ftcache.h"
	< #define FT_CACHE_INTERNAL_MANAGER_H  "ftcache.h"
	< #define FT_CACHE_INTERNAL_CACHE_H    "ftcache.h"
	< #define FT_CACHE_INTERNAL_GLYPH_H    "ftcache.h"
	< #define FT_CACHE_INTERNAL_IMAGE_H    "ftcache.h"
	< #define FT_CACHE_INTERNAL_SBITS_H    "ftcache.h"
	---
	> #define FT_CACHE_MANAGER_H           <ftcache.h>
	> #define FT_CACHE_INTERNAL_MRU_H      <ftcache.h>
	> #define FT_CACHE_INTERNAL_MANAGER_H  <ftcache.h>
	> #define FT_CACHE_INTERNAL_CACHE_H    <ftcache.h>
	> #define FT_CACHE_INTERNAL_GLYPH_H    <ftcache.h>
	> #define FT_CACHE_INTERNAL_IMAGE_H    <ftcache.h>
	> #define FT_CACHE_INTERNAL_SBITS_H    <ftcache.h>
	814c814
	< #define FT_INCREMENTAL_H          "ftincrem.h"
	---
	> #define FT_INCREMENTAL_H          <ftincrem.h>
	816c816
	< #define FT_TRUETYPE_UNPATENTED_H  "ttunpat.h"
	---
	> #define FT_TRUETYPE_UNPATENTED_H  <ttunpat.h>
	820c820
	<    * Include internal headers definitions from "internal/..."
	---
	>    * Include internal headers definitions from <internal/...>
	824c824
	< #define  FT_INTERNAL_INTERNAL_H  "internal/internal.h"
	---
	> #define  FT_INTERNAL_INTERNAL_H  <internal/internal.h>
	diff -r ../../include/ios/freetype2/config/ftoption.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/config/ftoption.h
	23c23
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/freetype.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/freetype.h
	32c32
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ft2build.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ft2build.h
	37c37
	< #include "config/ftheader.h"
	---
	> #include <config/ftheader.h>
	diff -r ../../include/ios/freetype2/ftadvanc.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftadvanc.h
	23c23
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftautoh.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftautoh.h
	22c22
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftbbox.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftbbox.h
	34c34
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftbdf.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftbdf.h
	22c22
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftbitmap.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftbitmap.h
	23c23
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftbzip2.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftbzip2.h
	22c22
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftcache.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftcache.h
	23c23
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftcffdrv.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftcffdrv.h
	22c22
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftcid.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftcid.h
	21c21
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftgasp.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftgasp.h
	22c22
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftglyph.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftglyph.h
	36c36
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftgxval.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftgxval.h
	31c31
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftgzip.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftgzip.h
	22c22
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftimage.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftimage.h
	33c33
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftincrem.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftincrem.h
	22c22
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftlcdfil.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftlcdfil.h
	23c23
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftlist.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftlist.h
	31c31
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftlzw.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftlzw.h
	22c22
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftmac.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftmac.h
	32c32
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftmm.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftmm.h
	23c23
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftmodapi.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftmodapi.h
	23c23
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftotval.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftotval.h
	33c33
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftoutln.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftoutln.h
	24c24
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftpfr.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftpfr.h
	22c22
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftrender.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftrender.h
	23c23
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftsizes.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftsizes.h
	32c32
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftsnames.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftsnames.h
	26c26
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftstroke.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftstroke.h
	22c22
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftsynth.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftsynth.h
	48c48
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftsystem.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftsystem.h
	23c23
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftttdrv.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftttdrv.h
	23c23
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/fttypes.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/fttypes.h
	23c23
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftwinfnt.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftwinfnt.h
	22c22
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ftxf86.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ftxf86.h
	22c22
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/t1tables.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/t1tables.h
	24c24
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ttnameid.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ttnameid.h
	23c23
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/tttables.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/tttables.h
	24c24
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/tttags.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/tttags.h
	23c23
	< #include "ft2build.h"
	---
	> #include <ft2build.h>
	diff -r ../../include/ios/freetype2/ttunpat.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/include/freetype2/ttunpat.h
	25c25
	< #include "ft2build.h"
	---
	> #include <ft2build.h>

	$ mv libfreetype.a libfreetype.a.dist
	$ cp -p ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/freetype/prebuilt/libfreetype.a .

	$ cd ../../..

1. 差異はヘッダーファイルの記述方法のみ

## jpeg

	$ cd jpeg/prebuilt/ios

	$ diff -r ../../include/ios ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/jpeg/include
	diff -r ../../include/ios/jconfig.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/jpeg/include/jconfig.h
	21c21
	< /* Define "boolean" as unsigned char, not int, on Windows systems. */
	---
	> /* Define "boolean" as unsigned char, not enum, on Windows systems. */
	25a26,31
	> #ifndef FALSE			/* in case these macros already exist */
	> #define FALSE	0		/* values of boolean */
	> #endif
	> #ifndef TRUE
	> #define TRUE	1
	> #endif
	diff -r ../../include/ios/jmorecfg.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/jpeg/include/jmorecfg.h
	5c5
	<  * Modified 1997-2012 by Guido Vollbeding.
	---
	>  * Modified 1997-2013 by Guido Vollbeding.
	17a18,20
	>  *   9   for 9-bit sample values
	>  *   10  for 10-bit sample values
	>  *   11  for 11-bit sample values
	19,21c22,30
	<  * Only 8 and 12 are legal data precisions for lossy JPEG according to the
	<  * JPEG standard, and the IJG code does not support anything else!
	<  * We do not support run-time selection of data precision, sorry.
	---
	>  * Only 8, 9, 10, 11, and 12 bits sample data precision are supported for
	>  * full-feature DCT processing.  Further depths up to 16-bit may be added
	>  * later for the lossless modes of operation.
	>  * Run-time selection and conversion of data precision will be added later
	>  * and are currently not supported, sorry.
	>  * Exception:  The transcoding part (jpegtran) supports all settings in a
	>  * single instance, since it operates on the level of DCT coefficients and
	>  * not sample values.  The DCT coefficients are of the same type (16 bits)
	>  * in all cases (see below).
	24c33
	< #define BITS_IN_JSAMPLE  8	/* use 8 or 12 */
	---
	> #define BITS_IN_JSAMPLE  8	/* use 8, 9, 10, 11, or 12 */
	79a89,130
	> #if BITS_IN_JSAMPLE == 9
	> /* JSAMPLE should be the smallest type that will hold the values 0..511.
	>  * On nearly all machines "short" will do nicely.
	>  */
	> 
	> typedef short JSAMPLE;
	> #define GETJSAMPLE(value)  ((int) (value))
	> 
	> #define MAXJSAMPLE	511
	> #define CENTERJSAMPLE	256
	> 
	> #endif /* BITS_IN_JSAMPLE == 9 */
	> 
	> 
	> #if BITS_IN_JSAMPLE == 10
	> /* JSAMPLE should be the smallest type that will hold the values 0..1023.
	>  * On nearly all machines "short" will do nicely.
	>  */
	> 
	> typedef short JSAMPLE;
	> #define GETJSAMPLE(value)  ((int) (value))
	> 
	> #define MAXJSAMPLE	1023
	> #define CENTERJSAMPLE	512
	> 
	> #endif /* BITS_IN_JSAMPLE == 10 */
	> 
	> 
	> #if BITS_IN_JSAMPLE == 11
	> /* JSAMPLE should be the smallest type that will hold the values 0..2047.
	>  * On nearly all machines "short" will do nicely.
	>  */
	> 
	> typedef short JSAMPLE;
	> #define GETJSAMPLE(value)  ((int) (value))
	> 
	> #define MAXJSAMPLE	2047
	> #define CENTERJSAMPLE	1024
	> 
	> #endif /* BITS_IN_JSAMPLE == 11 */
	> 
	> 
	255c306,309
	< #ifdef HAVE_BOOLEAN
	---
	> #ifndef HAVE_BOOLEAN
	> #if defined FALSE || defined TRUE || defined QGLOBAL_H
	> /* Qt3 defines FALSE and TRUE as "const" variables in qglobal.h */
	> typedef int boolean;
	264a319
	> #endif
	302,306c357,362
	< /* Note: if you selected 12-bit data precision, it is dangerous to turn off
	<  * ENTROPY_OPT_SUPPORTED.  The standard Huffman tables are only good for 8-bit
	<  * precision, so jchuff.c normally uses entropy optimization to compute
	<  * usable tables for higher precision.  If you don't want to do optimization,
	<  * you'll have to supply different default Huffman tables.
	---
	> /* Note: if you selected more than 8-bit data precision, it is dangerous to
	>  * turn off ENTROPY_OPT_SUPPORTED.  The standard Huffman tables are only
	>  * good for 8-bit precision, so arithmetic coding is recommended for higher
	>  * precision.  The Huffman encoder normally uses entropy optimization to
	>  * compute usable tables for higher precision.  Otherwise, you'll have to
	>  * supply different default Huffman tables.
	317c373
	< #define IDCT_SCALING_SUPPORTED	    /* Output rescaling via IDCT? */
	---
	> #define IDCT_SCALING_SUPPORTED	    /* Output rescaling via IDCT? (Requires DCT_ISLOW)*/
	diff -r ../../include/ios/jpeglib.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/jpeg/include/jpeglib.h
	5c5
	<  * Modified 2002-2012 by Guido Vollbeding.
	---
	>  * Modified 2002-2015 by Guido Vollbeding.
	42c42
	< #define JPEG_LIB_VERSION_MINOR  0
	---
	> #define JPEG_LIB_VERSION_MINOR  2
	46,47c46,47
	<  * All of these are specified by the JPEG standard, so don't change them
	<  * if you want to be compatible.
	---
	>  * All of these are specified by the JPEG standard,
	>  * so don't change them if you want to be compatible.
	160c160,161
	<    * downsampled_width = ceil(image_width * Hi/Hmax * DCT_h_scaled_size/DCTSIZE)
	---
	>    * downsampled_width =
	>    *   ceil(image_width * Hi/Hmax * DCT_h_scaled_size/block_size)
	165,167c166,172
	<   /* This flag is used only for decompression.  In cases where some of the
	<    * components will be ignored (eg grayscale output from YCbCr image),
	<    * we can skip most computations for the unused components.
	---
	>   /* For decompression, in cases where some of the components will be
	>    * ignored (eg grayscale output from YCbCr image), we can skip most
	>    * computations for the unused components.
	>    * For compression, some of the components will need further quantization
	>    * scale by factor of 2 after DCT (eg BG_YCC output from normal RGB input).
	>    * The field is first set TRUE for decompression, FALSE for compression
	>    * in initial_setup, and then adapted in color conversion setup.
	169c174
	<   boolean component_needed;	/* do we need the value of this component? */
	---
	>   boolean component_needed;
	218,219c223,224
	< 	JCS_RGB,		/* red/green/blue */
	< 	JCS_YCbCr,		/* Y/Cb/Cr (also known as YUV) */
	---
	> 	JCS_RGB,		/* red/green/blue, standard RGB (sRGB) */
	> 	JCS_YCbCr,		/* Y/Cb/Cr (also known as YUV), standard YCC */
	221c226,228
	< 	JCS_YCCK		/* Y/Cb/Cr/K */
	---
	> 	JCS_YCCK,		/* Y/Cb/Cr/K */
	> 	JCS_BG_RGB,		/* big gamut red/green/blue, bg-sRGB */
	> 	JCS_BG_YCC		/* big gamut Y/Cb/Cr, bg-sYCC */
	975c982
	< 			      unsigned char * inbuffer,
	---
	> 			      const unsigned char * inbuffer,

	$ mv libjpeg.a libjpeg.a.dist
	$ cp -p ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/jpeg/prebuilt/libjpeg.a .

	$ cd ../../..

1. 差異があるが、とりあえず無視

## tiff

	$ cd tiff/prebuilt/ios

	$ diff -rq ../../include/ios ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/tiff/include
	Only in ../../include/ios: tiffconf-32.h
	Only in ../../include/ios: tiffconf-64.h
	Files ../../include/ios/tiffconf.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/tiff/include/tiffconf.h differ
	$ diff ../../include/ios/tiffconf-64.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/tiff/include/tiffconf.h

	$ mv libtiff.a libtiff.a.dist
	$ cp -p ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/tiff/prebuilt/libtiff.a .

	$ cd ../../..

1. [external の tiffconf.h](https://github.com/cocos2d/cocos2d-x-3rd-party-libs-bin/blob/v3/tiff/include/ios/tiffconf.h) は ```__LP64__``` が定義されてると tiffconf-64.h を読み込み、それが cocos2d-x-3rd-party-libs-src の tiffconf.h と同一
    1. この差異もとりあえず無視

## webp

	$ cd webp/prebuilt/ios

	$ diff -r ../../include/ios ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/webp/include/webp

	$ mv libwebp.a libwebp.a.dist
	$ cp -p ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/webp/prebuilt/libwebp.a .

	$ cd ../../..

1. これも差異はなかった

## chipmunk

	$ cd chipmunk/prebuilt/ios

	$ diff -r ../../include ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/chipmunk/include
	diff -r ../../include/chipmunk/chipmunk.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/chipmunk/include/chipmunk/chipmunk.h
	31,35c31
	<     #if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)
	<         #define CP_EXPORT __declspec(dllexport)
	<     #else
	< 	    #define CP_EXPORT
	<     #endif
	---
	> 	#define CP_EXPORT __declspec(dllexport)

	$ mv libchipmunk.a libchipmunk.a.dist
	$ cp -p ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/chipmunk/prebuilt/libchipmunk.a .

	$ cd ../../..

1. diff で差異が見つかった
    1. external のバージョンは [cocos2d-x-3rd-party-libs-bin 固有のコード](https://github.com/cocos2d/cocos2d-x-3rd-party-libs-bin/commit/120b93f56b11d12cd610fa6ba018895bfedd6527)で、[本家](https://github.com/slembcke/Chipmunk2D/blob/master/include/chipmunk/chipmunk.h)には存在しないし [chipmunk/cocos2d.patch](https://github.com/cocos2d/cocos2d-x-3rd-party-libs-src/blob/v3/contrib/src/chipmunk/cocos2d.patch) にも存在しない
        1. cocos2d-x-3rd-party-libs-bin は cocos2d-x-3rd-party-libs-src からビルドしているものではないのかも・・・
        2. ```#ifdef WIN32``` で囲まれた部分での差異なのでコンパイル結果には影響ないはず
            1. この差異はとりあえず無視

## openssl

```
	$ cd openssl/prebuilt/ios

	$ diff -rq ../../include/ios ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include
  Files ../../include/ios/openssl/aes.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/aes.h differ
  Files ../../include/ios/openssl/asn1.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/asn1.h differ
  Files ../../include/ios/openssl/asn1t.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/asn1t.h differ
  Files ../../include/ios/openssl/bio.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/bio.h differ
  Files ../../include/ios/openssl/blowfish.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/blowfish.h differ
  Files ../../include/ios/openssl/bn.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/bn.h differ
  Files ../../include/ios/openssl/buffer.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/buffer.h differ
  Files ../../include/ios/openssl/camellia.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/camellia.h differ
  Files ../../include/ios/openssl/cast.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/cast.h differ
  Files ../../include/ios/openssl/cmac.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/cmac.h differ
  Files ../../include/ios/openssl/cms.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/cms.h differ
  Files ../../include/ios/openssl/comp.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/comp.h differ
  Files ../../include/ios/openssl/conf.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/conf.h differ
  Files ../../include/ios/openssl/conf_api.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/conf_api.h differ
  Files ../../include/ios/openssl/crypto.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/crypto.h differ
  Files ../../include/ios/openssl/ct.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/ct.h differ
  Files ../../include/ios/openssl/des.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/des.h differ
  Files ../../include/ios/openssl/dh.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/dh.h differ
  Files ../../include/ios/openssl/dsa.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/dsa.h differ
  Files ../../include/ios/openssl/e_os2.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/e_os2.h differ
  Files ../../include/ios/openssl/ec.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/ec.h differ
  Files ../../include/ios/openssl/ecdh.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/ecdh.h differ
  Files ../../include/ios/openssl/ecdsa.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/ecdsa.h differ
  Files ../../include/ios/openssl/engine.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/engine.h differ
  Files ../../include/ios/openssl/err.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/err.h differ
  Files ../../include/ios/openssl/evp.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/evp.h differ
  Files ../../include/ios/openssl/hmac.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/hmac.h differ
  Files ../../include/ios/openssl/idea.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/idea.h differ
  Files ../../include/ios/openssl/lhash.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/lhash.h differ
  Files ../../include/ios/openssl/md2.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/md2.h differ
  Files ../../include/ios/openssl/md4.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/md4.h differ
  Files ../../include/ios/openssl/md5.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/md5.h differ
  Files ../../include/ios/openssl/mdc2.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/mdc2.h differ
  Files ../../include/ios/openssl/objects.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/objects.h differ
  Files ../../include/ios/openssl/ocsp.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/ocsp.h differ
  Only in ../../include/ios/openssl: opensslconf-arm32.h
  Only in ../../include/ios/openssl: opensslconf-arm64.h
  Only in ../../include/ios/openssl: opensslconf-i386.h
  Only in ../../include/ios/openssl: opensslconf-x86_64.h
  Files ../../include/ios/openssl/opensslconf.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/opensslconf.h differ
  Files ../../include/ios/openssl/ossl_typ.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/ossl_typ.h differ
  Files ../../include/ios/openssl/pem.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/pem.h differ
  Files ../../include/ios/openssl/pkcs12.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/pkcs12.h differ
  Files ../../include/ios/openssl/pkcs7.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/pkcs7.h differ
  Files ../../include/ios/openssl/rand.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/rand.h differ
  Files ../../include/ios/openssl/rc2.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/rc2.h differ
  Files ../../include/ios/openssl/rc4.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/rc4.h differ
  Files ../../include/ios/openssl/rc5.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/rc5.h differ
  Files ../../include/ios/openssl/ripemd.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/ripemd.h differ
  Files ../../include/ios/openssl/rsa.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/rsa.h differ
  Files ../../include/ios/openssl/safestack.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/safestack.h differ
  Files ../../include/ios/openssl/seed.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/seed.h differ
  Files ../../include/ios/openssl/sha.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/sha.h differ
  Files ../../include/ios/openssl/srp.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/srp.h differ
  Files ../../include/ios/openssl/srtp.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/srtp.h differ
  Files ../../include/ios/openssl/ssl.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/ssl.h differ
  Files ../../include/ios/openssl/ssl3.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/ssl3.h differ
  Files ../../include/ios/openssl/symhacks.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/symhacks.h differ
  Files ../../include/ios/openssl/tls1.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/tls1.h differ
  Files ../../include/ios/openssl/ts.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/ts.h differ
  Files ../../include/ios/openssl/txt_db.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/txt_db.h differ
  Files ../../include/ios/openssl/ui.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/ui.h differ
  Files ../../include/ios/openssl/whrlpool.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/whrlpool.h differ
  Files ../../include/ios/openssl/x509.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/x509.h differ
  Files ../../include/ios/openssl/x509_vfy.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/x509_vfy.h differ
  Files ../../include/ios/openssl/x509v3.h and ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/include/openssl/x509v3.h differ

	$ mv libcrypto.a libcrypto.a.dist
	$ cp -p ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/crypto/prebuilt/libcrypto.a .

	$ mv libssl.a libssl.a.dist
	$ cp -p ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/ssl/prebuilt/libssl.a .

	$ cd ../../..
```

1. diff で差異が見つかったが、これも無視

## bullet

```
	$ cd bullet/prebuilt/ios

	$ diff -r ../../include ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/bullet/include
  Only in ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/bullet/include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/DX11: HLSL
  Only in ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/bullet/include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL: AMD
  Only in ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/bullet/include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL: Apple
  Only in ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/bullet/include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL: Intel
  Only in ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/bullet/include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL: MiniCL
  Only in ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/bullet/include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL: NVidia
  Only in ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/bullet/include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL: OpenCLC10
  diff -r ../../include/bullet/LinearMath/btVector3.h ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/bullet/include/bullet/LinearMath/btVector3.h
  42c42
  < #define BT_SHUFFLE(x,y,z,w) (((w)<<6 | (z)<<4 | (y)<<2 | (x)) & 0xFF)
  ---
  > #define BT_SHUFFLE(x, y, z, w) (((w) << 6 | (z) << 4 | (y) << 2 | (x)) & 0xff)

	$ for i in "libBulletCollision.a" "libBulletDynamics.a" "libBulletMultiThreaded.a" "libLinearMath.a" "libMiniCL.a"; do mv $i $i.dist; cp -p ../../../../../cocos2d-x-3rd-party-libs-src/build/ios/bullet/prebuilt/$i .; done

	$ cd ../../..
```

1. 差異はあったが、空ディレクトリと上記の修正