14 Commits

Author	SHA1	Message	Date
samuele3hu	cf0aa36c15	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module ... Conflicts: cocos/network/CMakeLists.txt cocos/storage/CMakeLists.txt	2014-08-07 14:02:50 +08:00
samuele3hu	aa4f407851	extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt	2014-08-07 13:53:13 +08:00
martell	75911658aa	Make CMake More Robust	2014-08-06 15:43:19 +01:00
samuele3hu	ee4e479ce1	Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting	2014-07-31 16:38:55 +08:00
andyque	c5ca0dbf10	fix android and linux compile error	2014-07-29 16:24:27 +08:00
andyque	94e311bebb	fix platform compile error	2014-06-27 16:11:35 +08:00
andyque	769300d25e	rename UILayout ... Executant.h to UILayoutManager.h	2014-05-28 10:17:34 +08:00
andyque	fe01d12a21	issue #5183, fix android compile error	2014-05-20 09:39:05 +08:00
andyque	b735ce3ffc	issue #5057, fix andriod and linux compile	2014-05-12 11:55:00 +08:00
Ricardo Quesada	25213c81f6	linux cmake improvements ... Added cocos/CMakeLists.txt which controls all the rest of the Cmake files	2014-05-01 13:01:51 -07:00
CaiWenzhi	243b7e5822	Modify layout and add Boxes	2014-03-25 17:15:54 +08:00
CaiWenzhi	c0b67e6d1b	Modify mk files	2014-03-25 14:28:58 +08:00
andyque	448b101578	fix linux compile error	2014-03-11 20:46:11 +08:00
andyque	cbcc1bbbcf	let ios project compile correct	2014-03-11 18:48:26 +08:00