issue #4729: Compilation error fixes for linux

CMakeLists.txt

@@ -141,6 +141,7 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/cocos/2d/renderer
   ${CMAKE_CURRENT_SOURCE_DIR}/cocos/2d/platform
   ${CMAKE_CURRENT_SOURCE_DIR}/cocos/base
+  ${CMAKE_CURRENT_SOURCE_DIR}/cocos/deprecated
   ${CMAKE_CURRENT_SOURCE_DIR}/cocos/physics
   ${CMAKE_CURRENT_SOURCE_DIR}/cocos/editor-support
   ${CMAKE_CURRENT_SOURCE_DIR}/cocos/math/kazmath

cocos/2d/Android.mk

@@ -30,7 +30,6 @@ CCClippingNode.cpp \
 CCComponent.cpp \
 CCComponentContainer.cpp \
 CCConfiguration.cpp \
-CCDeprecated.cpp \
 CCDirector.cpp \
 CCDrawingPrimitives.cpp \
 CCDrawNode.cpp \
@@ -128,20 +127,21 @@ renderer/CCRenderer.cpp \
 renderer/CCRenderMaterial.cpp \
 ../base/atitc.cpp \
 ../base/CCAffineTransform.cpp \
-../base/CCArray.cpp \
 ../base/CCAutoreleasePool.cpp \
 ../base/CCConsole.cpp \
 ../base/CCData.cpp \
 ../base/CCDataVisitor.cpp \
-../base/CCDictionary.cpp \
 ../base/CCGeometry.cpp \
 ../base/CCNS.cpp \
 ../base/CCRef.cpp \
-../base/CCSet.cpp \
-../base/CCString.cpp \
 ../base/CCValue.cpp \
 ../base/etc1.cpp \
 ../base/s3tc.cpp \
+../deprecated/CCArray.cpp \
+../deprecated/CCSet.cpp \
+../deprecated/CCString.cpp \
+../deprecated/CCDictionary.cpp \
+../deprecated/CCDeprecated.cpp \
 ../math/kazmath/kazmath/aabb.c \
 ../math/kazmath/kazmath/mat3.c \
 ../math/kazmath/kazmath/mat4.c \
@@ -174,22 +174,26 @@ renderer/CCRenderMaterial.cpp \
 
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
+                    $(LOCAL_PATH)/.. \
                     $(LOCAL_PATH)/renderer \
                     $(LOCAL_PATH)/../math/kazmath \
                     platform/android \
                     $(LOCAL_PATH)/../physics \
                     $(LOCAL_PATH)/../base \
+                    $(LOCAL_PATH)/../deprecated \
                     $(LOCAL_PATH)/../../external/tinyxml2 \
                     $(LOCAL_PATH)/../../external/unzip \
                     $(LOCAL_PATH)/../../external/chipmunk/include/chipmunk \
                     $(LOCAL_PATH)/../../external/xxhash
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
+                    $(LOCAL_PATH)/.. \
                     $(LOCAL_PATH)/renderer \
                     $(LOCAL_PATH)/../math/kazmath \
                     $(LOCAL_PATH)/platform/android \
                     $(LOCAL_PATH)/../physics \
                     $(LOCAL_PATH)/../base \
+                    $(LOCAL_PATH)/../deprecated \
                     $(LOCAL_PATH)/../../external/tinyxml2 \
                     $(LOCAL_PATH)/../../external/unzip \
                     $(LOCAL_PATH)/../../external/chipmunk/include/chipmunk \

cocos/2d/CCNode.h

@@ -31,7 +31,6 @@
 
 #include "ccMacros.h"
 #include "CCAffineTransform.h"
-#include "CCArray.h"
 #include "CCGL.h"
 #include "ccGLStateCache.h"
 #include "CCGLProgram.h"

cocos/2d/CMakeLists.txt

@@ -130,13 +130,11 @@ set(COCOS2D_SRC
   ccFPSImages.c
   ccTypes.cpp
   cocos2d.cpp
-  CCDeprecated.cpp
   platform/CCSAXParser.cpp
   platform/CCThread.cpp
   platform/CCGLViewProtocol.cpp
   platform/CCFileUtils.cpp
   platform/CCImage.cpp
-  ../../external/edtaa3func/edtaa3func.cpp
   renderer/CCCustomCommand.cpp
   renderer/CCFrustum.cpp
   renderer/CCGroupCommand.cpp
@@ -146,6 +144,8 @@ set(COCOS2D_SRC
   renderer/CCRenderCommand.cpp
   renderer/CCRenderer.cpp
   renderer/CCRenderMaterial.cpp
+  ../deprecated/CCDeprecated.cpp
+  ../../external/edtaa3func/edtaa3func.cpp
 )
 
 include(../physics/CMakeLists.txt)

cocos/base/CMakeLists.txt

@@ -1,13 +1,13 @@
 set(COCOS_BASE_SRC
+  ../deprecated/CCSet.cpp
+  ../deprecated/CCArray.cpp
+  ../deprecated/CCDictionary.cpp
+  ../deprecated/CCString.cpp
   CCAffineTransform.cpp
   CCAutoreleasePool.cpp
   CCGeometry.cpp
   CCNS.cpp
   CCRef.cpp
-  CCSet.cpp
-  CCArray.cpp
-  CCDictionary.cpp
-  CCString.cpp
   CCDataVisitor.cpp
   CCData.cpp
   CCValue.cpp

templates/cpp-template-default/CMakeLists.txt

@@ -58,6 +58,7 @@ include_directories(
   ${COCOS2D_ROOT}/cocos/2d/platform/desktop
   ${COCOS2D_ROOT}/cocos/2d/platform/linux
   ${COCOS2D_ROOT}/cocos/base
+  ${COCOS2D_ROOT}/cocos/deprecated
   ${COCOS2D_ROOT}/cocos/physics
   ${COCOS2D_ROOT}/cocos/editor-support
   ${COCOS2D_ROOT}/cocos/math/kazmath

templates/lua-template-default/frameworks/CMakeLists.txt

@@ -64,6 +64,7 @@ include_directories(
   ${COCOS2D_ROOT}/cocos/2d/platform/desktop
   ${COCOS2D_ROOT}/cocos/2d/platform/linux
   ${COCOS2D_ROOT}/cocos/base
+  ${COCOS2D_ROOT}/cocos/deprecated
   ${COCOS2D_ROOT}/cocos/physics
   ${COCOS2D_ROOT}/cocos/editor-support
   ${COCOS2D_ROOT}/cocos/math/kazmath