Fixed build error except Windows

build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-c4764647b4f09b4812b760bd686dd9eb2deca52c
+d5bc7043083749a9bb33b41b6f902c251d4de747

cocos/editor-support/cocostudio/Android.mk

@@ -39,7 +39,21 @@ CCSSceneReader.cpp \
 ObjectFactory.cpp \
 TriggerBase.cpp \
 TriggerMng.cpp \
-TriggerObj.cpp
+TriggerObj.cpp \
+WidgetReader/WidgetReader.cpp \
+WidgetReader/ButtonReader/ButtonReader.cpp \
+WidgetReader/CheckBoxReader/CheckBoxReader.cpp \
+WidgetReader/ImageViewReader/ImageViewReader.cpp \
+WidgetReader/LayoutReader/LayoutReader.cpp \
+WidgetReader/ListViewReader/ListViewReader.cpp \
+WidgetReader/LoadingBarReader/LoadingBarReader.cpp \
+WidgetReader/PageViewReader/PageViewReader.cpp \
+WidgetReader/ScrollViewReader/ScrollViewReader.cpp \
+WidgetReader/SliderReader/SliderReader.cpp \
+WidgetReader/TextAtlasReader/TextAtlasReader.cpp \
+WidgetReader/TextBMFontReader/TextBMFontReader.cpp \
+WidgetReader/TextFieldReader/TextFieldReader.cpp \
+WidgetReader/TextReader/TextReader.cpp \
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \
 $(LOCAL_PATH)/../../../external

cocos/gui/GUIDefine.h

@@ -26,7 +26,7 @@
 #define __TestCpp__GUIDefine__
 
 #include "cocos2d.h"
-#include "ExtensionMacros.h"
+#include "../../extensions/ExtensionMacros.h"
 #include <string>
 #include "cocostudio/ObjectFactory.h"
 

tests/Android.mk

@@ -60,23 +60,46 @@ Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp \
 Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp \
 Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp \
 Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.cpp \
 Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.cpp \
 Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp \
 Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp \
 Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp \
 Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp \
 Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp \
-Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp \
-Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp \
-Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp \
 Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp \
 Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp \
 Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp \
 Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp \
 Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp \
 Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp \
 Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp \
 Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp \
 Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp \
 Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp \
 Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp \

tests/Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.cpp

@@ -4,7 +4,7 @@
 #include "../../ExtensionsTest/ExtensionsTest.h"
 #include "CocosGUIScene.h"
 #include "GUIEditorTest.h"
-#include "CutomGUIScene.h"
+#include "CustomGUIScene.h"
 
 
 enum

tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.cpp

@@ -1,6 +1,6 @@
 
 
-#include "CutomGUIScene.h"
+#include "CustomGUIScene.h"
 #include "CocoStudioGUITest.h"
 #include "CustomTest/CustomImageTest/CustomImageTest.h"
 

tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp

@@ -1,7 +1,7 @@
 
 
 #include "CustomImageTest.h"
-#include "../../CutomGUIScene.h"
+#include "../../CustomGUIScene.h"
 #include "../../CustomWidget/CustomImageView.h"
 #include "../../CustomWidget/CustomImageViewReader.h"
 #include "../../CustomWidget/CustomReader.h"

tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.h

@@ -4,7 +4,7 @@
 #define __TestCpp__CustomImageScene__
 
 #include "cocos2d.h"
-#include "cocos-ext.h"
+#include "extensions/cocos-ext.h"
 #include "../../../../testBasic.h"
 
 USING_NS_CC;

tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.h

@@ -2,7 +2,7 @@
 #ifndef __TestCpp__CustomImageView__
 #define __TestCpp__CustomImageView__
 
-#include "CocosGUI.h"
+#include "gui/CocosGUI.h"
 
 USING_NS_CC;
 using namespace cocos2d::ui;

tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.h

@@ -3,7 +3,7 @@
 #ifndef __TestCpp__CustomImageViewReader__
 #define __TestCpp__CustomImageViewReader__
 
-#include "cocos-ext.h"
+#include "extensions/cocos-ext.h"
 #include "cocostudio/DictionaryHelper.h"
 #include "gui/CocosGUI.h"
 

tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.h

@@ -3,7 +3,7 @@
 #ifndef __TestCpp__CustomReader__
 #define __TestCpp__CustomReader__
 
-#include "cocos-ext.h"
+#include "extensions/cocos-ext.h"
 #include "cocostudio/DictionaryHelper.h"
 #include "gui/CocosGUI.h"
 

tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.cpp

@@ -2,7 +2,7 @@
 
 #include "UIScene_Editor.h"
 #include "GUIEditorTest.h"
-#include "CocosGUI.h"
+#include "gui/CocosGUI.h"
 #include "UISceneManager_Editor.h"
 
 

tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.h

@@ -26,7 +26,7 @@
 #define __TestCpp__UIScene_Editor__
 
 #include "cocos2d.h"
-#include "cocos-ext.h"
+#include "extensions/cocos-ext.h"
 #include "gui/CocosGUI.h"
 #include "cocostudio/CocoStudio.h"
 

tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp

@@ -1,7 +1,7 @@
 
 
 #include "UITextTest_Editor.h"
-#include "CocosGUI.h"
+#include "gui/CocosGUI.h"
 
 
 // UITextTest_Editor