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

Merge pull request #28 from cocos2d/develop 

update with upstream
This commit is contained in:
James Chen 2014-03-15 00:12:10 +08:00
parent 7cff033b55 d0bb70ef52
commit 1f1ead6d3f
26 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.REMOVED.git-id
View File

@ -1 +1 @@
bc27256c9160e89f1e4332b0bde80f703ce80337
ed6a237f1b27f7e01651cab5938d8b309670f5f3

12
README.md
View File

@ -36,11 +36,15 @@ Example:
### Build and run new project for android ###
$ cocos run -p android
$ cocos run -p -j 4 android
### Build and run new project for iOS & OSX ###
### Build and run new project for iOS ###
$ cocos run -p ios
### Build and run new project for OSX ###
$ cocos run -p mac
### Build and run new project for linux ###
@ -53,8 +57,7 @@ script in **cocos2d/build/install-deps-linux.sh**
Then
$ cd /home/MyGame
$ cmake .
$ make
$ cocos run -p linux
Run
@ -103,6 +106,7 @@ Build Requirements
* Mac OS X 10.7+, Xcode 4.6+
* or Ubuntu 12.10+, CMake 2.6+
* or Windows 7+, VS 2012+
* Python 2.7.5
Runtime Requirements

2
build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
bbf0323293cba3d7ee58ef36706831a8761692d8
b8986c04c89d3861f82fb99b0df633ac2cc4a13c

6
external/curl/include/ios/curl/curlbuild.h vendored
View File

@ -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

2
external/curl/prebuilt/ios/libcurl.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
c135286e812602cc184684b59b4d074f723ef4a5
dc1d98e73cda98024add3420a06fa29651c863d0

1
external/curl/prebuilt/ios/libcurl_arm64.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
9b09288998b6198388456c41ccbdd5596622abe5

2
external/freetype2/prebuilt/ios/libfreetype.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
3303f759eb8c682843322ffa9f8c69563d241ca5
81b071fde15c160fb96e2b28a22142e903fdf5a4

1
external/freetype2/prebuilt/ios/libfreetype_arm64.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
690402fd689da9d29621e7665db2f40ac4e947eb

2
external/jpeg/prebuilt/ios/libjpeg.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
39c4d5970691b3a3ca47be0f7d2a0b5c72e9e2ee
e8281e5ccfc438a1d097b9704010312801ea192e

1
external/jpeg/prebuilt/ios/libjpeg_arm64.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
dd93f7d77c23392642750b58fb0f41eda9218b69

2
external/jpeg/prebuilt/mac/libjpeg.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
fc2d13f253f62b28ad1d37a4a24da1e977acba20
d8eeb3fe1c71ca56139f7e31f0b502da876c692b

2
external/png/prebuilt/ios/libpng.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
2a8128e7d552dc8b2d79c1cbd8c84c21ad578672
c4decf3cb39b46189df24c54868f46e985b15de2

1
external/png/prebuilt/ios/libpng_arm64.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
13d38a8f7cf04ee464b3eaf5fd7464853499390e

2
external/png/prebuilt/mac/libpng.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
fb78024e2f81c33d196af83e7740de7c7f4ea021
373f86ef034bf18f5d52588747c02d7896884730

4
external/tiff/include/ios/tiffconf.h vendored
View File

@ -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

2
external/tiff/prebuilt/ios/libtiff.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
60433133a48054eb884d9e6a0cee95fe4ba22b1c
286c39ddabb05b91c81ee5d7ec0a1301d0be3108

1
external/tiff/prebuilt/ios/libtiff_arm64.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
39aa0b352df6cb1adf2390cf199910b21a3b3c12

2
external/tiff/prebuilt/mac/libtiff.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
5fe8aca7e0bfa91c79b4b6b0a562f88a6653c452
e5cd88ead5723950d6f69e8bd72b4b18b2f9d893

9
external/version.txt vendored Normal file
View File

@ -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

2
external/webp/prebuilt/ios/libwebp.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
c26c3c22887023d322926dcbbd0f69377deedaf8
7f9f32e81cbd068ab7a9c408a26eedfdcc8d6e30

1
external/webp/prebuilt/ios/libwebp_arm64.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
904e2e16f2f4846b4550b9ba25e8b709f6c4337e

2
external/webp/prebuilt/mac/libwebp.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
4c5c7d34a90f5fcac954f6d44803173224d8ead2
6b5decfe3f5b19bacfbd9778cb58843a7161a6a9

2
external/websockets/prebuilt/ios/libwebsockets.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
ee4ee6cc26274f6d3138d08d429d6ba49b629f53
5c60f0b27edd2650caee8a96948272604a8098d5

2
external/websockets/prebuilt/mac/libwebsockets.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
5d0743ce07a9c865d4367d8e3db161148676f2c8
36c2d4cb652d9a93fa2a285cb8c73f237612bb46

2
templates/cocos2dx_files.json.REMOVED.git-id
View File

@ -1 +1 @@
725d085b1800d788b0a8cf1ec615d750573dce15
f4bce3132cbe1c4651bd4805ef89f428c384f0e9

2
tools/cocos2d-console

@ -1 +1 @@
Subproject commit 44cdb17faa6ec169c18e77233fd74bd5afeb8195
Subproject commit 2b88fb0bfb1277f480c721f1d520d8555acc2d5d