12 Commits

Author	SHA1	Message	Date
AlexV	234c902630	fixing cmakelist after merge	2014-05-15 22:26:41 +09:00
AlexV	d7f1af876a	fixed network link library curl in win32 case : libcurl_imp	2014-05-10 10:07:57 +09: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
Éloi Rivard	4272d4fa61	Linux websockets support.	2014-02-13 00:53:51 +01:00
WuHuan	f87af9e998	fix linux build	2014-01-09 19:49:11 +08:00
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	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	922924e1ab	TestCpp is ok.	2013-11-04 21:03:07 +08:00