From c9def73930ec0b6266a01b116ef229987db1f86e Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 26 Jul 2013 20:24:33 +0800 Subject: [PATCH] Application::Platform::OS_MACOS --> Application::Platform::OS_MAC. --- cocos2dx/CCDeprecated.cpp | 2 +- cocos2dx/platform/CCApplicationProtocol.h | 2 +- cocos2dx/platform/mac/CCApplication.mm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cocos2dx/CCDeprecated.cpp b/cocos2dx/CCDeprecated.cpp index 1c2518ff6d..5daeecff64 100644 --- a/cocos2dx/CCDeprecated.cpp +++ b/cocos2dx/CCDeprecated.cpp @@ -180,7 +180,7 @@ const LanguageType kLanguagePolish = LanguageType::POLISH; const Application::Platform kTargetWindows = Application::Platform::OS_WINDOWS; const Application::Platform kTargetLinux = Application::Platform::OS_LINUX; -const Application::Platform kTargetMacOS = Application::Platform::OS_MACOS; +const Application::Platform kTargetMacOS = Application::Platform::OS_MAC; const Application::Platform kTargetAndroid = Application::Platform::OS_ANDROID; const Application::Platform kTargetIphone = Application::Platform::OS_IPHONE; const Application::Platform kTargetIpad = Application::Platform::OS_IPAD; diff --git a/cocos2dx/platform/CCApplicationProtocol.h b/cocos2dx/platform/CCApplicationProtocol.h index 684bbb3dd6..b567072279 100644 --- a/cocos2dx/platform/CCApplicationProtocol.h +++ b/cocos2dx/platform/CCApplicationProtocol.h @@ -18,7 +18,7 @@ public: { OS_WINDOWS, OS_LINUX, - OS_MACOS, + OS_MAC, OS_ANDROID, OS_IPHONE, OS_IPAD, diff --git a/cocos2dx/platform/mac/CCApplication.mm b/cocos2dx/platform/mac/CCApplication.mm index 9e8d79b36c..62047a3d4f 100644 --- a/cocos2dx/platform/mac/CCApplication.mm +++ b/cocos2dx/platform/mac/CCApplication.mm @@ -62,7 +62,7 @@ void Application::setAnimationInterval(double interval) Application::Platform Application::getTargetPlatform() { - return Platform::OS_MACOS; + return Platform::OS_MAC; } /////////////////////////////////////////////////////////////////////////////////////////////////