6 Commits

Author SHA1 Message Date
minggo
d40b8739bc Merge branch 'v3.6.0' into develop_merge_v3.6 2022-07-18 10:38:14 +08:00
minggo
3e818c45c9 Change macro name (#11528)
* CC_PLATFORM_MAC_IOS -> CC_PLATFORM_IOS

* CC_PLATFORM_MAC_OSX -> CC_PLATFORM_MACOS

* add codes to keep compatible
2022-06-16 14:05:16 +08:00
minggo
1bb0c717d0 fix macro redefine warning of platform defination (#2099) 2020-01-20 15:12:49 +08:00
Jare Guo
d9bd3d763c update license (#1089)
* updating license

* update license
2018-02-01 15:20:01 +08:00
zhangbin
4acadb9595 Update the version of rapid json. 2016-09-02 11:40:59 +08:00
2youyouo2
6ca97fef49 add simulator 2016-04-13 16:43:49 +08:00