Commit Graph

21 Commits

Author SHA1 Message Date
chengstory 2232e0f015 fixed #3457 remove jsoncpp cmakelist. 2013-12-26 13:35:33 +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 8f574272ee removed unneeded directories for Mingw cmake 2013-12-05 03:54:44 +00:00
martell e5ada6f377 added support for msys2 mingwtoolchains and fix x64 cocos/audio on windows platform for MSVC and Mingw. Also fixed a few very bad type casts very important for future Arm64 bit processors 2013-12-05 03:37:27 +00:00
martell 3b9d8274f8 Restore Linux CMake to default 2013-12-02 07:41:27 +00:00
martell 4f0f3f3235 fix for -DEBUG=1 2013-12-02 06:57:47 +00:00
martell 1a94e393af Setup for testing for every windows user 2013-11-30 09:36:22 +00:00
martell 2abca22bf4 Disabled some annoying Level 4 Warnings 2013-11-30 08:27:34 +00:00
martell 5c40fecd5e fix cmake for linux 2013-11-30 08:18:09 +00:00
martell 79401a7596 quickly added win32 cmake 2013-11-30 06:09:12 +00:00
Oleg Loginov 6be59456a5 correct type in root CMakeLists.txt 2013-11-07 01:24:33 +04:00
James Chen d6d041f561 issue #3113: [Linux] Adding options for modules. 2013-11-06 19:17:34 +08:00
James Chen 9be8ca3714 [cmake] output lib to root/lib 2013-11-04 21:03:08 +08:00
James Chen f17aa8b450 Move the library of fmod to external folder. 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 c085412636 [CMake] TestLua and HelloLua is ok. 2013-11-04 21:03:07 +08:00
James Chen 922924e1ab TestCpp is ok. 2013-11-04 21:03:07 +08:00
James Chen e560de6e4e HelloCpp works. 2013-11-04 21:03:07 +08:00
James Chen add96f63a6 Adding top level cmakefiles.txt 2013-11-04 21:03:07 +08:00