Revert "issue #5176, fix compile error on other platforms"

This reverts commit 9118d7a98a.

Conflicts:
	cocos/ui/UIFocusManager.h
This commit is contained in:
andyque 2014-05-26 18:19:23 +08:00
parent 1a6dba8656
commit 69d5b486af
4 changed files with 1 additions and 11 deletions

View File

@ -29,8 +29,7 @@ CCProtectedNode.cpp \
UIHBox.cpp \ UIHBox.cpp \
UIVBox.cpp \ UIVBox.cpp \
UIRelativeBox.cpp \ UIRelativeBox.cpp \
UIVideoPlayerAndroid.cpp \ UIVideoPlayerAndroid.cpp
UIFocusManager.cpp
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \
$(LOCAL_PATH)/../editor-support $(LOCAL_PATH)/../editor-support

View File

@ -22,6 +22,5 @@ set(COCOS_UI_SRC
ui/UITextField.cpp ui/UITextField.cpp
ui/UIVBox.cpp ui/UIVBox.cpp
ui/UIWidget.cpp ui/UIWidget.cpp
ui/UIFocusManager.cpp
) )

View File

@ -15,7 +15,6 @@
<ClInclude Include="..\CocosGUI.h" /> <ClInclude Include="..\CocosGUI.h" />
<ClInclude Include="..\UIButton.h" /> <ClInclude Include="..\UIButton.h" />
<ClInclude Include="..\UICheckBox.h" /> <ClInclude Include="..\UICheckBox.h" />
<ClInclude Include="..\UIFocusManager.h" />
<ClInclude Include="..\UIHBox.h" /> <ClInclude Include="..\UIHBox.h" />
<ClInclude Include="..\UIHelper.h" /> <ClInclude Include="..\UIHelper.h" />
<ClInclude Include="..\UIImageView.h" /> <ClInclude Include="..\UIImageView.h" />
@ -42,7 +41,6 @@
<ClCompile Include="..\CocosGUI.cpp" /> <ClCompile Include="..\CocosGUI.cpp" />
<ClCompile Include="..\UIButton.cpp" /> <ClCompile Include="..\UIButton.cpp" />
<ClCompile Include="..\UICheckBox.cpp" /> <ClCompile Include="..\UICheckBox.cpp" />
<ClCompile Include="..\UIFocusManager.cpp" />
<ClCompile Include="..\UIHBox.cpp" /> <ClCompile Include="..\UIHBox.cpp" />
<ClCompile Include="..\UIHelper.cpp" /> <ClCompile Include="..\UIHelper.cpp" />
<ClCompile Include="..\UIImageView.cpp" /> <ClCompile Include="..\UIImageView.cpp" />

View File

@ -90,9 +90,6 @@
<ClInclude Include="..\UILayoutExecutant.h"> <ClInclude Include="..\UILayoutExecutant.h">
<Filter>Layouts</Filter> <Filter>Layouts</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\UIFocusManager.h">
<Filter>BaseClasses</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\UIScrollView.cpp"> <ClCompile Include="..\UIScrollView.cpp">
@ -164,8 +161,5 @@
<ClCompile Include="..\UILayoutExecutant.cpp"> <ClCompile Include="..\UILayoutExecutant.cpp">
<Filter>Layouts</Filter> <Filter>Layouts</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\UIFocusManager.cpp">
<Filter>BaseClasses</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>