13 Commits

Author	SHA1	Message	Date
martell	75911658aa	Make CMake More Robust	2014-08-06 15:43:19 +01:00
andyque	5624da5448	Merge branch 'v3' into cleanupBinaryLoader ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/editor-support/cocostudio/CCSGUIReader.h cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters	2014-06-23 09:37:39 +08:00
andyque	b55b95adc3	fix linux compile error	2014-06-18 18:28:31 +08:00
2youyou2	c5fe56ef21	update CMakeLists.txt	2014-06-16 09:44:14 +08:00
andyque	d089b251db	fix other platform compile error	2014-06-04 14:56:34 +08:00
CaiWenzhi	bd5c11b5ee	Modify mk file and solve warnings	2014-03-06 16:15:03 +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
James Chen	2a3481f20c	Moves temp files to CURRENT_BINARY_DIR.	2014-01-06 23:44:36 -08:00
chengstory	26df681915	fixed #3457 remove jsoncpp.	2013-12-26 22:45: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
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	922924e1ab	TestCpp is ok.	2013-11-04 21:03:07 +08:00