26 Commits

Author	SHA1	Message	Date
Huabing.Xu	041bef148a	Merge branch 'origin/develop' ... Conflicts: cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj cocos2dx/proj.win32/cocos2d.vcxproj.filters	2013-07-02 13:47:02 +08:00
Huabing.Xu	4e9e893c8e	1. Add C++ code to decode ETC file ... 2. Configuration and function supportsETC()	2013-07-01 17:40:57 +08:00
James Chen	c2ce65a32b	issue #2347: Compiled ok for android, marmalade and nacl, windows needs to be tested too.	2013-07-01 17:35:51 +08:00
Sam Clegg	04d7d5a061	[NaCl] Add support for building using glibc toolchain. ... BUG= R=binji@chromium.org Review URL: https://codereview.chromium.org/14694016	2013-06-20 12:56:14 -07:00
Sam Clegg	5c4545de3c	[NaCl] Remove use of -lnosys	2013-06-20 12:56:13 -07:00
Sam Clegg	47878c1855	[NaCl] Remove legacy nacl_mounts usage. ... Also add nacl SDK version check to ensure the SDK contains a recent version of nacl_io.	2013-06-20 12:56:12 -07:00
Sam Clegg	40766006bd	[NaCl] Fix NaCl build which had been disabled. ... Since switching to C++11 the NaCL build was disabled. This re-enables the ARM configuration which uses a more recent version of gcc. This means that that NaCl code paths will at least be test until we can find a way to re-enable the X86 build.	2013-06-20 12:56:12 -07:00
minggo	cd5bcb87af	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
James Chen	51aa2433fc	Updating makefile for native client.	2013-06-08 15:35:45 +08:00
chengstory	cfb424a6c9	1. add Component struct.	2013-06-04 17:38:43 +08:00
minggo	5c1a408797	issue #2242:use -std=gnu++0x for linux and native client project	2013-06-03 13:50:19 +08:00
minggo	0a64e7a041	enable c++11 for linux and natvie client projects	2013-06-03 11:02:54 +08:00
Jaroslaw Lewandowski	3f7c506638	Ability to save/retrieve CCData into/from CCUserDefault	2013-05-29 01:06:41 +01:00
minggo	6f624351b3	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support	2013-05-28 11:36:05 +08:00
minggo	b038741d78	issue #2161: make linux,marmalade,native client,mac and emscripten project to include CCTextureETC.cpp	2013-05-27 15:06:43 +08:00
samuele3hu	338c7c8d67	issue #2103 add more test lua	2013-05-24 11:42:27 +08:00
James Chen	8448280ed3	issue 2217: Updating Make file and project configuration to add ccFPSImage.c.	2013-05-23 16:50:48 +08:00
James Chen	42427634f2	fixed #2142: Adding datavisitor support for other platforms except win32.	2013-05-10 15:37:40 +08:00
James Chen	1eb79530c6	fixed #1847: -DCC_ENABLE_BOX2D_INTEGRATION ~> -DCC_ENABLE_BOX2D_INTEGRATION=1, ... -DCC_ENABLE_CHIPMUNK_INTEGRATION ~> -DCC_ENABLE_CHIPMUNK_INTEGRATION=1.	2013-04-17 12:49:25 +08:00
Sam Clegg	ffb7360e46	Enable easy swithing between Box2D and chipmunk in linux and nacl ... The ENABLE_BOX2D/ENABLE_CHIPMUNK defines were previously hardcoded in the Makefiles. Now you get chipmunk by default on both platforms and can enble Box2D by setting USE_BOX2D in your environment. Also remove erroneous -D__CC_PLATFORM_FILEUTILS_CPP__ and -D__CC_PLATFORM_IMAGE_CPP__ from linux Makefiles. These should never be defined globally like this.	2013-04-15 07:35:50 -07:00
Sam Clegg	863286b0b9	Fix warning in linux build. ... Also, define _DEBUG rather then DEBUG in linux and nacl makefiles by default, and limit the command line definions that are used when building Box2D.	2013-03-12 16:59:22 -07:00
minggo	dd8681b18b	Merge pull request #2113 from minggo/refactor-ccuserdefault ... Refactor ccuserdefault	2013-03-06 23:05:50 -08:00
minggo	e85989f76e	issue #1529:modify marmalade and native client project configuration	2013-03-07 09:51:26 +08:00
Sam Clegg	ce247a6304	[NaCl] Fix warnings in ARM build	2013-03-06 13:02:55 -08:00
Sam Clegg	7ad171d8ee	Use same top level Makefile for nacl and linux builds. ... Also, re-use some of the concepts from the linux build system (such as quite by default) in the nacl build. Fix remaining warnings in NaCl builds.	2013-03-06 13:02:55 -08:00
Sam Clegg	33c422d1d5	Add new port: Native Client	2013-03-02 12:15:24 -08:00