From 73450be71598bd9a1339ce57923f7f155e343cbe Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Tue, 9 Sep 2014 17:11:06 -0700 Subject: [PATCH] compiles and runs in Linux --- cocos/platform/linux/CCApplication-linux.cpp | 2 +- cocos/platform/linux/CCCommon-linux.cpp | 2 +- cocos/platform/linux/CCFileUtils-linux.cpp | 4 ++-- cocos/platform/linux/CCStdC-linux.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cocos/platform/linux/CCApplication-linux.cpp b/cocos/platform/linux/CCApplication-linux.cpp index c23d0f9883..65000f5a3c 100644 --- a/cocos/platform/linux/CCApplication-linux.cpp +++ b/cocos/platform/linux/CCApplication-linux.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "CCApplication.h" +#include "CCApplication-linux.h" #include #include #include diff --git a/cocos/platform/linux/CCCommon-linux.cpp b/cocos/platform/linux/CCCommon-linux.cpp index 320f96d108..63fa8ed8ce 100644 --- a/cocos/platform/linux/CCCommon-linux.cpp +++ b/cocos/platform/linux/CCCommon-linux.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX #include "platform/CCCommon.h" -#include "CCStdC.h" +#include "CCStdC-linux.h" #include "base/CCConsole.h" NS_CC_BEGIN diff --git a/cocos/platform/linux/CCFileUtils-linux.cpp b/cocos/platform/linux/CCFileUtils-linux.cpp index dfb882c885..f34a231088 100644 --- a/cocos/platform/linux/CCFileUtils-linux.cpp +++ b/cocos/platform/linux/CCFileUtils-linux.cpp @@ -26,10 +26,10 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "CCFileUtilsLinux.h" +#include "CCFileUtils-linux.h" +#include "CCApplication-linux.h" #include "platform/CCCommon.h" #include "base/ccMacros.h" -#include "CCApplication.h" #include "deprecated/CCString.h" #include #include diff --git a/cocos/platform/linux/CCStdC-linux.cpp b/cocos/platform/linux/CCStdC-linux.cpp index 14eb0c984d..8cbffa3835 100644 --- a/cocos/platform/linux/CCStdC-linux.cpp +++ b/cocos/platform/linux/CCStdC-linux.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "CCStdC.h" +#include "CCStdC-linux.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)