Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue #5056. fix linux & android compile error

This commit is contained in:
andyque 2014-05-08 15:20:24 +08:00
parent 898a66131a
commit e48e26cfdc
2 changed files with 92 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
tests/cpp-tests/Android.mk
View File

@ -60,51 +60,51 @@ Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp \
Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp \ Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp \
Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp \ Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp \
Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp \ Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.cpp \ Classes/UITest/CocoStudioGUITest/CocoStudioGUITest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp \ Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.cpp \ Classes/UITest/CocoStudioGUITest/GUIEditorTest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.cpp \ Classes/UITest/CocoStudioGUITest/CustomGUIScene.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp \ Classes/UITest/CocoStudioGUITest/UIScene.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp \ Classes/UITest/CocoStudioGUITest/UISceneManager.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp \ Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UIFocusTest/UIFocusTest.cpp \ Classes/UITest/CocoStudioGUITest/UIFocusTest/UIFocusTest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp \ Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp \ Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp \ Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp \ Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp \ Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp \ Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp \ Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp \ Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.cpp \ Classes/UITest/CocoStudioGUITest/UITextTest/UITextTest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp \ Classes/UITest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp \ Classes/UITest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp \ Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp \ Classes/UITest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp \ Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UIScene_Editor.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UISceneManager_Editor.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp \ Classes/UITest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.cpp \ Classes/UITest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp \ Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.cpp \ Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.cpp \ Classes/UITest/CocoStudioGUITest/CustomWidget/CustomReader.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp \ Classes/UITest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp \
Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp \ Classes/UITest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp \
Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp \ Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp \
Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp \ Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp \
Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp \ Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp \
@ -175,6 +175,7 @@ Classes/TouchesTest/TouchesTest.cpp \
Classes/TransitionsTest/TransitionsTest.cpp \ Classes/TransitionsTest/TransitionsTest.cpp \
Classes/UnitTest/RefPtrTest.cpp \ Classes/UnitTest/RefPtrTest.cpp \
Classes/UnitTest/UnitTest.cpp \ Classes/UnitTest/UnitTest.cpp \
Classes/UITest/UITest.cpp \
Classes/UserDefaultTest/UserDefaultTest.cpp \ Classes/UserDefaultTest/UserDefaultTest.cpp \
Classes/ZwoptexTest/ZwoptexTest.cpp Classes/ZwoptexTest/ZwoptexTest.cpp

91
tests/cpp-tests/CMakeLists.txt
View File

@ -74,51 +74,51 @@ set(SAMPLE_SRC
Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp
Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp
Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp
Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.cpp Classes/UITest/CocoStudioGUITest/CocoStudioGUITest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.cpp Classes/UITest/CocoStudioGUITest/GUIEditorTest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.cpp Classes/UITest/CocoStudioGUITest/CustomGUIScene.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp Classes/UITest/CocoStudioGUITest/UIScene.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp Classes/UITest/CocoStudioGUITest/UISceneManager.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UIFocusTest/UIFocusTest.cpp Classes/UITest/CocoStudioGUITest/UIFocusTest/UIFocusTest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.cpp Classes/UITest/CocoStudioGUITest/UITextTest/UITextTest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp Classes/UITest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp Classes/UITest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp Classes/UITest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.cpp Classes/UITest/CocoStudioGUITest/UIScene_Editor.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.cpp Classes/UITest/CocoStudioGUITest/UISceneManager_Editor.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp Classes/UITest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp Classes/UITest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp Classes/UITest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp
Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp Classes/UITest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp
Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp Classes/UITest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp
Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.cpp Classes/UITest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.cpp
Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp
Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.cpp Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.cpp
Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.cpp Classes/UITest/CocoStudioGUITest/CustomWidget/CustomReader.cpp
Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp Classes/UITest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp
Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp Classes/UITest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp
Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp
Classes/NewRendererTest/NewRendererTest.cpp Classes/NewRendererTest/NewRendererTest.cpp
Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp
@ -176,6 +176,7 @@ set(SAMPLE_SRC
Classes/ConsoleTest/ConsoleTest.cpp Classes/ConsoleTest/ConsoleTest.cpp
Classes/UnitTest/RefPtrTest.cpp Classes/UnitTest/RefPtrTest.cpp
Classes/UnitTest/UnitTest.cpp Classes/UnitTest/UnitTest.cpp
Classes/UITest/UITest.cpp
Classes/controller.cpp Classes/controller.cpp
Classes/testBasic.cpp Classes/testBasic.cpp
Classes/AppDelegate.cpp Classes/AppDelegate.cpp