8 Commits

Author	SHA1	Message	Date
WuHuan	1cd68accc1	Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop	2014-01-08 17:03:44 +08:00
WuHuan	954ee61022	testcpp mingw	2014-01-08 16:58:36 +08:00
James Chen	2a3481f20c	Moves temp files to CURRENT_BINARY_DIR.	2014-01-06 23:44:36 -08:00
James Chen	b0af2667f8	Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole ... Conflicts: cocos/scripting/auto-generated	2013-12-05 12:48:32 +08:00
Ricardo Quesada	b52d535a42	fixes indentation issues ... and some compilations issues on Linux	2013-12-04 18:19:51 -08:00
James Chen	60874ece64	issue #2790: Updates Makefile, Moves some codes to CCValue.cpp.	2013-12-04 16:18:22 +08:00
James Chen	9be8ca3714	[cmake] output lib to root/lib	2013-11-04 21:03:08 +08:00
James Chen	8676523433	Adding CMakeLists.txt	2013-11-04 21:03:07 +08:00