Commit Graph

141 Commits

Author SHA1 Message Date
James Gregory cb9c5688b2 Add libtiff build -- build with straight emconfigure, emmake, with a troublesome assert removed (assert(sizeof(uint64) == 8)). 2013-05-01 13:33:55 -07:00
James Gregory 3c14d57a09 Rebuild libfreetype without references to my home dir in it. 2013-05-01 13:33:54 -07:00
James Gregory dafd1e6ceb Add note on origin of libxml binary. 2013-05-01 13:33:53 -07:00
James Gregory 9033dd011e Add libxml2 build for Emscripten. 2013-05-01 13:33:53 -07:00
James Gregory 54560fb966 Add freetype2 headers that match the .a we're using. 2013-05-01 13:33:51 -07:00
James Gregory dd9e82c068 Add pre-build dependencies for Emscripten libpng, libz. 2013-05-01 13:33:51 -07:00
James Gregory e6c9fb79a0 Remove freetype source and add libfreetype.a as built by the Emscripten test-suite.
Revert "Add freetype 2.4.11 to repo"

This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
2013-05-01 13:33:50 -07:00
billy1380 cdfe693583 - changed cocos2d mac project to support universal build and x86
- fixed issues associated with that
2013-03-23 16:04:51 +00:00
minggo 9afc6729dc fix build error caused by libcurl on android x86 2013-03-20 11:53:19 +08:00
James Chen 71589e68ee fixed #1760: Redefinition of cpufeatures module. 2013-03-04 10:08:02 +08:00
minggo d983dd505c fixed #1752:use unstripped version to resolve link error 2013-02-27 10:44:34 +08:00
minggo fcf4bb9bef Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager 2013-02-25 18:12:38 +08:00
minggo 442e8ea0cc issue #1489:android works ok 2013-02-25 16:58:10 +08:00
James Chen 8e819ac32c Updates libcurl with ssl support for win32. 2013-02-25 16:16:57 +08:00
minggo c8baa94753 issue #1489: update ios libcurl and add android project 2013-02-25 14:33:04 +08:00
James Chen 1415c90bd4 webp lib depends on the module of cpufeatures when compiling with "APP_ABI := armeabi-v7a". 2013-02-18 17:52:13 +08:00
fape 1ed9d643c5 prevent WEBP_USE_SSE2 2013-02-06 17:44:06 +01:00
fape 7e19a5464a Include missing header files to libwebp's marmalade project file. 2013-02-06 16:17:47 +01:00
fape 19c266ef47 include missing CCPlatformMacros.h 2013-02-06 16:16:40 +01:00
fape b51102d234 marmalade webp fixes 2013-02-06 14:40:48 +01:00
James Chen e547735730 fixed #1770: Adding the library of webp for linux 32bit. 2013-02-06 16:33:54 +08:00
James Chen 561f6ca435 issue #1770: Adding webp image format support for linux 64bit. 2013-02-06 15:47:23 +08:00
James Chen cc690c5a86 issue #1770: Adding webp support for mac port. 2013-02-06 13:06:48 +08:00
James Chen 1e5431bcc5 issue #1770: Adding webp support for blackberry and marmalade. 2013-02-06 10:52:13 +08:00
James Chen a94e1b2a9d issue #1770: Webp works ok on Android and iOS. 2013-02-05 18:18:53 +08:00
dualface d6686fe57c Merge branch 'upstream_master' into add_webp_support 2013-02-02 12:24:05 +08:00
minggo dcaa3900a4 fixed #1679: use unstripped libs for armeabi-v7a 2013-01-25 14:49:25 +08:00
James Chen 8ec1a66db4 Removed glew-1.7.0.tgz. 2013-01-22 18:34:51 +08:00
ivzave 03f1efff78 ignore unpacked glew 2013-01-21 18:01:57 +04:00
James Chen f95d1677df Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into iss-blackberry 2013-01-04 09:52:01 +08:00
Dale Ducharme 611db78b39 Removing grskia dependancy and adding in freetype support to the builds. 2013-01-02 18:53:31 -05:00
fape 29a2f273b1 reorganize third party libs 2012-12-29 23:56:14 +01:00
fape 4421b6bf7a remove unused libs 2012-12-29 23:53:39 +01:00
dualface 0b25220f22 update libwebp to 2.1
add support RGB888, RGB565,RGBA4444
2012-12-30 02:12:02 +08:00
dualface b50e4cdf2b add WebP support 2012-12-29 10:27:43 +08:00
Mat Hopwood f75f6c2b64 Mac OS Marmalade fixes
Fixed compile issues on Mac OS
2012-12-10 09:54:34 +08:00
James Chen c79cac3af6 Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade 2012-11-15 10:10:53 +08:00
Mat Hopwood 148a558405 Tiff support and resource location
* Tiff support added to CCImage
* CCFileUtils updated to support resource folders
* Examples updated to support multiple resolution assets
2012-11-14 17:46:09 +00:00
James Chen 833b5b1be8 Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade
Conflicts:
	cocos2dx/base_nodes/CCNode.cpp
	cocos2dx/sprite_nodes/CCSprite.cpp
	samples/TestCpp/Classes/TouchesTest/Ball.cpp
	samples/TestCpp/Classes/VisibleRect.cpp
	samples/TestCpp/Classes/VisibleRect.h
2012-11-12 10:20:04 +08:00
James Chen 26547c7b30 fixed #1548: Updated libcurl header files to 7.26.0 on iOS. 2012-11-05 13:13:46 +08:00
minggo 95d3f87bd7 fix compiling error on linux 64 bit 2012-11-01 15:38:48 +08:00
minggo 5aad6eeb9b Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into update-curl 2012-10-29 14:44:26 +08:00
minggo e992408a86 issue #1312:update libcurl for linux 64 2012-10-29 14:39:44 +08:00
James Chen 45783574fd Upgraded libcurl to 7.26.0 for linux port(32bit). 2012-10-29 11:27:25 +08:00
James Chen 6d34e66018 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-10-29 10:51:58 +08:00
James Chen 9673b20775 issue #1312: Upgraded libcurl to 7.26.0 for windows port. 2012-10-29 10:49:28 +08:00
minggo 81ff3d3495 issue #1312: use --strip-unneeded parameter to strip lib 2012-10-25 16:30:14 +08:00
minggo 84e48ed7e7 issue #1312:update libcurl for android and strip all libs 2012-10-25 14:32:28 +08:00
Mat Hopwood 988835560d Marmalade Support
Full Marmalade support added for Cocos2d-x
2012-10-19 16:26:34 +01:00
jzgenius ad5b687848 [lib] New libcurl.a, armv7 & armv7s & simulator Supported. 2012-09-22 13:16:23 +08:00