axmol/cocos2dx/platform/win32
Huabing.Xu e935481361 Merge branch 'develop' into Iss2460-glfw-refractor
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/platform/mac/CCEGLView.mm
	samples/Cpp/TestCpp/proj.linux/main.cpp
	samples/Cpp/TestCpp/proj.win32/main.cpp
2013-08-28 13:42:22 +08:00
..
compat fixes #1359 , MSVC's stdint absence 2012-09-22 17:36:36 +09:00
CCAccelerometer.cpp issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance() 2013-07-12 13:11:21 +08:00
CCAccelerometer.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCApplication.cpp issue #2460: glfw window version 2013-08-20 13:57:15 +08:00
CCApplication.h enum class for LanguageType, Application::Platform 2013-07-26 17:29:06 +08:00
CCCommon.cpp Compilation error fixes, since CCLog has been renamed to 'log', all platforms should implement it. 2013-07-24 10:14:42 +08:00
CCDevice.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCEGLView.cpp issue #2460: glfw windows version: remove some unused function 2013-08-20 15:19:48 +08:00
CCEGLView.h issue #2460: glfw windows version: remove some unused function 2013-08-20 15:19:48 +08:00
CCFileUtilsWin32.cpp closed #2469:LabelTest and TileMapTest crash on windows. 2013-08-02 17:31:19 +08:00
CCFileUtilsWin32.h closed #2650: Remove ccTypeInfo since we could get the hash value from *typeid(T).hash_code()* if using c++11. 2013-08-22 18:16:50 +08:00
CCGL.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCImage.cpp Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 2013-07-29 11:40:18 +08:00
CCPlatformDefine.h issue #2322: Macro CC_DLL take no effect now since we are using static library. 2013-06-23 17:21:13 +08:00
CCStdC.cpp fixed #1647: Adding WebSocket support for Cpp and JSB. 2013-05-31 23:13:03 +08:00
CCStdC.h issue #2430: [Win32] Undefine the macro RELATIVE since it was conflicted with CCBReader::SizeType::RELATIVE and CCBReader::ScaleType::RELATIVE. 2013-07-27 23:20:00 +08:00