From 143f5975a6b09fc6faa0e22004cf9126eb247566 Mon Sep 17 00:00:00 2001
From: andyque <guanghui8827@126.com>
Date: Tue, 18 Feb 2014 10:33:19 +0800
Subject: [PATCH] fix cross-platform comiple error details: remove
 CCActionEaseEx dependency fix compile errors on android platform fix a few
 inproper decalare fix linux compile error fix win32 compile error

---
 cocos/2d/Android.mk                                       | 1 +
 cocos/2d/CMakeLists.txt                                   | 1 +
 cocos/2d/cocos2d.vcxproj                                  | 2 ++
 cocos/editor-support/cocostudio/Android.mk                | 2 --
 cocos/editor-support/cocostudio/CCTween.cpp               | 2 +-
 cocos/editor-support/cocostudio/CCTween.h                 | 2 +-
 cocos/editor-support/cocostudio/CMakeLists.txt            | 2 --
 .../cocostudio/proj.win32/libCocosStudio.vcxproj          | 6 +-----
 .../cocostudio/proj.win32/libCocosStudio.vcxproj.filters  | 8 +-------
 .../module/cocos_files.json.REMOVED.git-id                | 2 +-
 10 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/cocos/2d/Android.mk b/cocos/2d/Android.mk
index 9932cd34a9..7f72172784 100644
--- a/cocos/2d/Android.mk
+++ b/cocos/2d/Android.mk
@@ -12,6 +12,7 @@ CCAction.cpp \
 CCActionCamera.cpp \
 CCActionCatmullRom.cpp \
 CCActionEase.cpp \
+CCTweenFunction.cpp \
 CCActionGrid.cpp \
 CCActionGrid3D.cpp \
 CCActionInstant.cpp \
diff --git a/cocos/2d/CMakeLists.txt b/cocos/2d/CMakeLists.txt
index 43e552f704..9a8f09846a 100644
--- a/cocos/2d/CMakeLists.txt
+++ b/cocos/2d/CMakeLists.txt
@@ -30,6 +30,7 @@ endif()
 set(COCOS2D_SRC
   CCAction.cpp
   CCActionCamera.cpp
+  CCTweenFunction.cpp
   CCActionEase.cpp
   CCActionGrid.cpp
   CCActionGrid3D.cpp
diff --git a/cocos/2d/cocos2d.vcxproj b/cocos/2d/cocos2d.vcxproj
index f6f71ee254..859e7c66ab 100644
--- a/cocos/2d/cocos2d.vcxproj
+++ b/cocos/2d/cocos2d.vcxproj
@@ -299,6 +299,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
     <ClCompile Include="CCTransitionPageTurn.cpp" />
     <ClCompile Include="CCTransitionProgress.cpp" />
     <ClCompile Include="ccTypes.cpp" />
+    <ClCompile Include="CCTweenFunction.cpp" />
     <ClCompile Include="CCUserDefault.cpp" />
     <ClCompile Include="ccUTF8.cpp" />
     <ClCompile Include="ccUtils.cpp" />
@@ -497,6 +498,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
     <ClInclude Include="CCTransitionPageTurn.h" />
     <ClInclude Include="CCTransitionProgress.h" />
     <ClInclude Include="ccTypes.h" />
+    <ClInclude Include="CCTweenFunction.h" />
     <ClInclude Include="CCUserDefault.h" />
     <ClInclude Include="ccUTF8.h" />
     <ClInclude Include="ccUtils.h" />
diff --git a/cocos/editor-support/cocostudio/Android.mk b/cocos/editor-support/cocostudio/Android.mk
index 7f8d1c4de2..612959940f 100644
--- a/cocos/editor-support/cocostudio/Android.mk
+++ b/cocos/editor-support/cocostudio/Android.mk
@@ -6,7 +6,6 @@ LOCAL_MODULE := cocostudio_static
 LOCAL_MODULE_FILENAME := libcocostudio
 
 LOCAL_SRC_FILES := CCActionFrame.cpp \
-CCActionEaseEx.cpp \
 CCActionFrameEasing.cpp \
 CCActionManagerEx.cpp \
 CCActionNode.cpp \
@@ -28,7 +27,6 @@ CCArmatureDefine.cpp \
 CCDataReaderHelper.cpp \
 CCSpriteFrameCacheHelper.cpp \
 CCTransformHelp.cpp \
-CCTweenFunction.cpp \
 CCUtilMath.cpp \
 CCComAttribute.cpp \
 CCComAudio.cpp \
diff --git a/cocos/editor-support/cocostudio/CCTween.cpp b/cocos/editor-support/cocostudio/CCTween.cpp
index 4c0240f91d..90ca396c5d 100644
--- a/cocos/editor-support/cocostudio/CCTween.cpp
+++ b/cocos/editor-support/cocostudio/CCTween.cpp
@@ -476,7 +476,7 @@ float Tween::updateFrameData(float currentPercent)
      *  If frame tween easing equal to TWEEN_EASING_MAX, then it will not do tween.
      */
     TweenType tweenType = (_frameTweenEasing != Linear) ? _frameTweenEasing : _tweenEasing;
-    if (tweenType != ::cocos2d::tweenfunc::TWEEN_EASING_MAX && tweenType != Linear && !_passLastFrame)
+    if (tweenType != cocos2d::tweenfunc::TWEEN_EASING_MAX && tweenType != Linear && !_passLastFrame)
     {
         currentPercent = cocos2d::tweenfunc::tweenTo(currentPercent, tweenType, _from->easingParams);
     }
diff --git a/cocos/editor-support/cocostudio/CCTween.h b/cocos/editor-support/cocostudio/CCTween.h
index f4e2ec32cd..41ef3a2651 100644
--- a/cocos/editor-support/cocostudio/CCTween.h
+++ b/cocos/editor-support/cocostudio/CCTween.h
@@ -133,7 +133,7 @@ protected:
 
     Bone *_bone;                    //! A weak reference to the Bone
 
-    cocos2d::tweenfunc::TweenType _frameTweenEasing;  //! Dedermine which tween effect current frame use
+    TweenType _frameTweenEasing;  //! Dedermine which tween effect current frame use
 
     int _betweenDuration;           //! Current key frame will last _betweenDuration frames
     int _totalDuration;
diff --git a/cocos/editor-support/cocostudio/CMakeLists.txt b/cocos/editor-support/cocostudio/CMakeLists.txt
index a6f86af9e5..ed3e249ea2 100644
--- a/cocos/editor-support/cocostudio/CMakeLists.txt
+++ b/cocos/editor-support/cocostudio/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(CS_SRC
-  CCActionEaseEx.cpp
   CCActionFrame.cpp
   CCActionFrameEasing.cpp
   CCActionManagerEx.cpp
@@ -22,7 +21,6 @@ set(CS_SRC
   CCDataReaderHelper.cpp
   CCSpriteFrameCacheHelper.cpp
   CCTransformHelp.cpp
-  CCTweenFunction.cpp
   CCUtilMath.cpp
   CCComAttribute.cpp
   CCComAudio.cpp
diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj
index f572d6f892..bb266258f5 100644
--- a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj
+++ b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj
@@ -11,7 +11,6 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\CCActionEaseEx.cpp" />
     <ClCompile Include="..\CCActionFrame.cpp" />
     <ClCompile Include="..\CCActionFrameEasing.cpp" />
     <ClCompile Include="..\CCActionManagerEx.cpp" />
@@ -41,7 +40,6 @@
     <ClCompile Include="..\CCSSceneReader.cpp" />
     <ClCompile Include="..\CCTransformHelp.cpp" />
     <ClCompile Include="..\CCTween.cpp" />
-    <ClCompile Include="..\CCTweenFunction.cpp" />
     <ClCompile Include="..\CCUtilMath.cpp" />
     <ClCompile Include="..\DictionaryHelper.cpp" />
     <ClCompile Include="..\ObjectFactory.cpp" />
@@ -60,7 +58,6 @@
     <ClInclude Include="..\..\..\..\external\json\reader.h" />
     <ClInclude Include="..\..\..\..\external\json\stringbuffer.h" />
     <ClInclude Include="..\..\..\..\external\json\writer.h" />
-    <ClInclude Include="..\CCActionEaseEx.h" />
     <ClInclude Include="..\CCActionFrame.h" />
     <ClInclude Include="..\CCActionFrameEasing.h" />
     <ClInclude Include="..\CCActionManagerEx.h" />
@@ -91,7 +88,6 @@
     <ClInclude Include="..\CCSSceneReader.h" />
     <ClInclude Include="..\CCTransformHelp.h" />
     <ClInclude Include="..\CCTween.h" />
-    <ClInclude Include="..\CCTweenFunction.h" />
     <ClInclude Include="..\CCUtilMath.h" />
     <ClInclude Include="..\DictionaryHelper.h" />
     <ClInclude Include="..\ObjectFactory.h" />
@@ -178,4 +174,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
index bf17c59cbb..dde1432396 100644
--- a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
+++ b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
@@ -123,9 +123,6 @@
     <ClCompile Include="..\CCBone.cpp">
       <Filter>armature</Filter>
     </ClCompile>
-    <ClCompile Include="..\CCActionEaseEx.cpp">
-      <Filter>action</Filter>
-    </ClCompile>
     <ClCompile Include="..\CCActionFrame.cpp">
       <Filter>action</Filter>
     </ClCompile>
@@ -266,9 +263,6 @@
     <ClInclude Include="..\..\..\..\external\json\internal\strfunc.h">
       <Filter>json\rapidjson\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\CCActionEaseEx.h">
-      <Filter>action</Filter>
-    </ClInclude>
     <ClInclude Include="..\CCActionFrame.h">
       <Filter>action</Filter>
     </ClInclude>
@@ -300,4 +294,4 @@
       <Filter>components</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tools/project-creator/module/cocos_files.json.REMOVED.git-id b/tools/project-creator/module/cocos_files.json.REMOVED.git-id
index 1ac56ac75b..6e9967cecf 100644
--- a/tools/project-creator/module/cocos_files.json.REMOVED.git-id
+++ b/tools/project-creator/module/cocos_files.json.REMOVED.git-id
@@ -1 +1 @@
-3964e888d4b32decf6c4b8cc4146336d1c9c935a
\ No newline at end of file
+716ec00b6d77f9f6945f9cd4f107e407bebbd668
\ No newline at end of file