11 Commits

Author	SHA1	Message	Date
Ricardo Quesada	b36d77b1c2	Android and Linux fixes	2013-12-18 12:07:51 -08:00
Ricardo Quesada	5c9b8db0cb	Updates project files file Linux and Android	2013-12-17 18:47:46 -08:00
James Chen	12cc6c6153	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer ... Conflicts: cocos/2d/CMakeLists.txt	2013-12-17 15:50:24 +08:00
James Chen	2a38d4fe94	issue #2171: Fixing compilation errors for Linux port.	2013-12-17 14:50:40 +08:00
Dhilan007	39280d55f3	new label:add support for distanceField ... PerformanceTest:add performance test for label.	2013-12-13 12:42:15 +08:00
martell	06ff1bc594	Fixed HelloCpp Linking on Linux	2013-12-02 07:10:37 +00:00
martell	79401a7596	quickly added win32 cmake	2013-11-30 06:09:12 +00:00
James Chen	f3c40a3e7a	issue #3113: 32Bit fix and 13.10 32bit complication is ok.	2013-11-06 14:54:35 +08:00
James Chen	9be8ca3714	[cmake] output lib to root/lib	2013-11-04 21:03:08 +08:00
James Chen	daa91ad413	[CMake] Update library dependency.	2013-11-04 21:03:07 +08:00
James Chen	8676523433	Adding CMakeLists.txt	2013-11-04 21:03:07 +08:00