Commit Graph

13 Commits

Author SHA1 Message Date
minggo 7aaf4be85f move platform_support into cocos2dx/platform 2011-03-09 11:38:36 +08:00
yangws 1a17f3ea55 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
Conflicts:
	cocos2dx/platform/win32/CCXApplication_win32.cpp
	tests/test.win32/test.win32.vcproj
2011-01-22 17:52:06 +08:00
minggo 3746b5e4fc remove SimpleAudioEngine in sln 2011-01-21 18:11:43 +08:00
minggo d64ac9fdb8 issue #311: cocosdenshion for android 2011-01-19 16:00:19 +08:00
yangws 67c0ad6332 add platform support project on win32.
Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.
2011-01-15 18:05:35 +08:00
yangws b67e821fdb delete unnecessary project in sln 2010-12-28 17:56:38 +08:00
yangws aa521489a0 template for vs2008 add CocosDenshion namespace. 2010-12-25 15:44:26 +08:00
Walzer 156e667849 merge tests/proj.uphone & framework.uphone, merge tests/proj.win32 & framework.win32 2010-12-20 12:47:56 +08:00
Walzer b4152fa700 fixed #222 merge different HelloWorld to one directory just like "tests", except HelloWorld.android 2010-11-27 18:25:31 +08:00
yangws 852c57d2c6 add CCLOG support on win32 and uphone 2010-11-23 18:20:46 +08:00
yangws de97900b6c CCLOG support for cocos2d-win32 2010-11-23 11:23:29 +08:00
Walzer dcba22aa72 issue #211 don't check out now! 2010-11-18 16:01:29 +00:00
Walzer 78a2792dcb issue #211 cocos2d-x.abc -> cocos2d-abc 2010-11-18 15:58:58 +00:00