diff --git a/extensions/Android.mk b/extensions/Android.mk index 5e186de9f9..2cc83d8669 100644 --- a/extensions/Android.mk +++ b/extensions/Android.mk @@ -55,10 +55,6 @@ CocoStudio/Components/CCComAudio.cpp \ CocoStudio/Components/CCComController.cpp \ CocoStudio/Components/CCComRender.cpp \ CocoStudio/Components/CCInputDelegate.cpp \ -CocoStudio/GUI/Action/UIAction.cpp \ -CocoStudio/GUI/Action/UIActionFrame.cpp \ -CocoStudio/GUI/Action/UIActionManager.cpp \ -CocoStudio/GUI/Action/UIActionNode.cpp \ CocoStudio/GUI/BaseClasses/UIRootWidget.cpp \ CocoStudio/GUI/BaseClasses/UIWidget.cpp \ CocoStudio/GUI/Layouts/Layout.cpp \ diff --git a/extensions/proj.emscripten/Makefile b/extensions/proj.emscripten/Makefile index fdd3cef72c..5811dbca76 100644 --- a/extensions/proj.emscripten/Makefile +++ b/extensions/proj.emscripten/Makefile @@ -83,10 +83,6 @@ SOURCES = ../CCBReader/CCBFileLoader.cpp \ ../CocoStudio/Components/CCComController.cpp \ ../CocoStudio/Components/CCComRender.cpp \ ../CocoStudio/Components/CCInputDelegate.cpp \ -../CocoStudio/GUI/Action/UIAction.cpp \ -../CocoStudio/GUI/Action/UIActionFrame.cpp \ -../CocoStudio/GUI/Action/UIActionManager.cpp \ -../CocoStudio/GUI/Action/UIActionNode.cpp \ ../CocoStudio/GUI/BaseClasses/UIRootWidget.cpp \ ../CocoStudio/GUI/BaseClasses/UIWidget.cpp \ ../CocoStudio/GUI/Layouts/Layout.cpp \ diff --git a/extensions/proj.linux/Makefile b/extensions/proj.linux/Makefile index 372c23b68b..d491fc23ab 100644 --- a/extensions/proj.linux/Makefile +++ b/extensions/proj.linux/Makefile @@ -81,10 +81,6 @@ SOURCES = ../CCBReader/CCBFileLoader.cpp \ ../CocoStudio/Components/CCComController.cpp \ ../CocoStudio/Components/CCComRender.cpp \ ../CocoStudio/Components/CCInputDelegate.cpp \ -../CocoStudio/GUI/Action/UIAction.cpp \ -../CocoStudio/GUI/Action/UIActionFrame.cpp \ -../CocoStudio/GUI/Action/UIActionManager.cpp \ -../CocoStudio/GUI/Action/UIActionNode.cpp \ ../CocoStudio/GUI/BaseClasses/UIRootWidget.cpp \ ../CocoStudio/GUI/BaseClasses/UIWidget.cpp \ ../CocoStudio/GUI/Layouts/Layout.cpp \ diff --git a/extensions/proj.nacl/Makefile b/extensions/proj.nacl/Makefile index 36b2b42edb..48cd332a41 100644 --- a/extensions/proj.nacl/Makefile +++ b/extensions/proj.nacl/Makefile @@ -68,12 +68,36 @@ EXTENSIONS_SOURCES = ../CCBReader/CCBFileLoader.cpp \ ../CocoStudio/Components/CCComController.cpp \ ../CocoStudio/Components/CCComRender.cpp \ ../CocoStudio/Components/CCInputDelegate.cpp \ +../CocoStudio/GUI/BaseClasses/UIRootWidget.cpp \ +../CocoStudio/GUI/BaseClasses/UIWidget.cpp \ +../CocoStudio/GUI/Layouts/Layout.cpp \ +../CocoStudio/GUI/Layouts/LayoutExecutant.cpp \ +../CocoStudio/GUI/Layouts/LayoutParameter.cpp \ +../CocoStudio/GUI/Layouts/UILayoutDefine.cpp \ +../CocoStudio/GUI/System/CocosGUI.cpp \ +../CocoStudio/GUI/System/UIHelper.cpp \ +../CocoStudio/GUI/System/UIInputManager.cpp \ +../CocoStudio/GUI/System/UILayer.cpp \ +../CocoStudio/GUI/UIWidgets/UIButton.cpp \ +../CocoStudio/GUI/UIWidgets/UICheckBox.cpp \ +../CocoStudio/GUI/UIWidgets/UIImageView.cpp \ +../CocoStudio/GUI/UIWidgets/UILabel.cpp \ +../CocoStudio/GUI/UIWidgets/UILabelAtlas.cpp \ +../CocoStudio/GUI/UIWidgets/UILabelBMFont.cpp \ +../CocoStudio/GUI/UIWidgets/UILoadingBar.cpp \ +../CocoStudio/GUI/UIWidgets/UISlider.cpp \ +../CocoStudio/GUI/UIWidgets/UITextField.cpp \ +../CocoStudio/GUI/UIWidgets/ScrollWidget/UIDragPanel.cpp \ +../CocoStudio/GUI/UIWidgets/ScrollWidget/UIListView.cpp \ +../CocoStudio/GUI/UIWidgets/ScrollWidget/UIPageView.cpp \ +../CocoStudio/GUI/UIWidgets/ScrollWidget/UIScrollView.cpp \ ../CocoStudio/Json/CSContentJsonDictionary.cpp \ ../CocoStudio/Json/DictionaryHelper.cpp \ ../CocoStudio/Json/lib_json/json_value.cpp \ ../CocoStudio/Json/lib_json/json_reader.cpp \ ../CocoStudio/Json/lib_json/json_writer.cpp \ ../CocoStudio/Reader/CCSSceneReader.cpp \ +../CocoStudio/Reader/CCSGUIReader.cpp \ ../CocoStudio/Action/CCActionFrame.cpp \ ../CocoStudio/Action/CCActionFrameEasing.cpp \ ../CocoStudio/Action/CCActionManagerEx.cpp \