17 Commits

Author	SHA1	Message	Date
2youyou2	5bce6b87ea	change ActionTimeline to cocostudio ActionTimeline folder	2014-06-13 18:51:32 +08:00
2youyou2	2031e0e92d	change TimelineAction to ActionTimeline	2014-06-13 16:03:03 +08:00
2youyou2	b181eaf802	modify mk file	2014-06-13 14:43:53 +08:00
2youyou2	b2c5334de1	change NodeCache to NodeReader	2014-06-12 19:24:27 +08:00
2youyou2	db992b6d0f	modify cocostudio Android.mk	2014-06-12 16:26:18 +08:00
andyque	d089b251db	fix other platform compile error	2014-06-04 14:56:34 +08:00
Ricardo Quesada	32f3fedb37	Moves cocos/2d/Android.mk to cocos/Android.mk ... Easier to find Android.mk	2014-05-01 14:09:26 -07:00
andyque	48772fb952	modify android makefile	2014-03-11 18:48:28 +08:00
CaiWenzhi	4f9dfdbef8	Fixed build error except Windows	2014-03-05 21:18:51 +08:00
andyque	143f5975a6	fix cross-platform comiple error ... details: remove CCActionEaseEx dependency fix compile errors on android platform fix a few inproper decalare fix linux compile error fix win32 compile error	2014-02-18 14:22:15 +08:00
chengstory	ab3cf064d1	fixed #4357 failed to build android.	2013-12-26 13:26:23 +08:00
chengstory	8ae7ecff33	Merge branch 'develop' into #3457 ... Conflicts: build/cocos2d_samples.xcodeproj/project.pbxproj cocos/editor-support/cocostudio/CCSGUIReader.cpp cocos/editor-support/cocostudio/CCSGUIReader.h	2013-12-26 12:55:52 +08:00
minggo	d07d054a01	issue #2905:ndk-r8e build ok now	2013-10-23 17:44:20 +08:00
minggo	63c13d8eaa	issue #2905:simplify Android.mk dependence	2013-10-18 14:18:36 +08:00
minggo	e50f9fc43b	issue #2905: jsbinding samples and lua binding samples build ok on android	2013-10-17 15:04:30 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00
minggo	6fc2be62f5	issue #2905: testcpp bild ok on Android	2013-10-15 18:00:03 +08:00