From d8061477c129ec89db59ba2705eccd241b252806 Mon Sep 17 00:00:00 2001 From: James Chen Date: Sat, 7 Dec 2013 14:21:01 +0800 Subject: [PATCH] issue #2790: Removes CCSort.h/.cpp from projects. --- build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- extensions/Android.mk | 1 - extensions/CMakeLists.txt | 1 - extensions/proj.win32/libExtensions.vcxproj | 2 -- extensions/proj.win32/libExtensions.vcxproj.filters | 6 ------ 5 files changed, 1 insertion(+), 11 deletions(-) diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id index 8646685fa1..8f1be0f32e 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -c3b97117ff38c9347b34f01a67fd7206af29194d \ No newline at end of file +42f742346aec806886a8fd399aa42f689cafa71c \ No newline at end of file diff --git a/extensions/Android.mk b/extensions/Android.mk index a5f4fd051f..a06c09bc47 100644 --- a/extensions/Android.mk +++ b/extensions/Android.mk @@ -25,7 +25,6 @@ GUI/CCEditBox/CCEditBoxImplNone.cpp \ GUI/CCEditBox/CCEditBoxImplTizen.cpp \ GUI/CCEditBox/CCEditBoxImplWin.cpp \ GUI/CCScrollView/CCScrollView.cpp \ -GUI/CCScrollView/CCSorting.cpp \ GUI/CCScrollView/CCTableView.cpp \ GUI/CCScrollView/CCTableViewCell.cpp \ physics-nodes/CCPhysicsDebugNode.cpp \ diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt index 176cd831ce..f8083e1220 100644 --- a/extensions/CMakeLists.txt +++ b/extensions/CMakeLists.txt @@ -18,7 +18,6 @@ set(EXTENSIONS_SRC GUI/CCEditBox/CCEditBoxImplTizen.cpp GUI/CCEditBox/CCEditBoxImplWin.cpp GUI/CCScrollView/CCScrollView.cpp - GUI/CCScrollView/CCSorting.cpp GUI/CCScrollView/CCTableView.cpp GUI/CCScrollView/CCTableViewCell.cpp physics-nodes/CCPhysicsDebugNode.cpp diff --git a/extensions/proj.win32/libExtensions.vcxproj b/extensions/proj.win32/libExtensions.vcxproj index 7a3615643f..1e00952529 100644 --- a/extensions/proj.win32/libExtensions.vcxproj +++ b/extensions/proj.win32/libExtensions.vcxproj @@ -110,7 +110,6 @@ - @@ -138,7 +137,6 @@ - diff --git a/extensions/proj.win32/libExtensions.vcxproj.filters b/extensions/proj.win32/libExtensions.vcxproj.filters index d43ac6197c..fe37d0def2 100644 --- a/extensions/proj.win32/libExtensions.vcxproj.filters +++ b/extensions/proj.win32/libExtensions.vcxproj.filters @@ -24,9 +24,6 @@ GUI\CCScrollView - - GUI\CCScrollView - GUI\CCScrollView @@ -94,9 +91,6 @@ - - GUI\CCScrollView - GUI\CCScrollView