12 Commits

Author	SHA1	Message	Date
Dale Ducharme	611db78b39	Removing grskia dependancy and adding in freetype support to the builds.	2013-01-02 18:53:31 -05:00
James Chen	d2ad820a48	fixed #1627: Adding view name for sample applications.	2012-12-29 14:50:00 +08:00
James Chen	9bd302e35b	fixed #1627: VS version check in project file.	2012-12-29 13:54:46 +08:00
James Chen	f2f3aa55bf	Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012 ... Conflicts: samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj scripting/javascript/bindings/generated scripting/lua/proj.win32/liblua.vcxproj	2012-12-29 09:48:22 +08:00
ivzave	fcce930188	repair linux eclipse build & add 64-bit project configurations	2012-12-22 07:14:59 +04:00
minggo	89fb58e791	issue #1603:change pathes of android codes	2012-12-21 17:28:14 +08:00
James Chen	a36446cba2	Merge branch 'iss1603-adjust-directory' of https://github.com/minggo/cocos2d-x into iss1603-adjust-directory	2012-12-20 18:39:52 +08:00
James Chen	f65717cd86	issue #1603: updated linux project configuration.	2012-12-20 17:49:34 +08:00
James Chen	08aa5066a5	issue #1603: updated blackberry, linux, marmalade project configurations.	2012-12-20 17:47:30 +08:00
minggo	977046cc32	issue #1603:make some samples build ok on iOS	2012-12-20 17:20:10 +08:00
James Chen	dcfd38756d	Updated android build files.	2012-12-20 14:04:49 +08:00
James Chen	4660e72eda	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00