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

fix tizen compile issue (#17002) 

* fix tizen compile issue

* fix linux compile issue
This commit is contained in:
子龙山人 2016-12-14 11:55:38 +08:00 committed by minggo
parent edca6862b9
commit 3302781dae
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/tizen/.gitignore vendored
View File

@ -1,3 +1,6 @@
/SA_Report
/Emulator
/res
/Debug
/Debug
/Debug

1
cocos/ui/UIEditBox/UIEditBoxImpl-tizen.h
View File

@ -64,6 +64,7 @@ public:
virtual void setInputMode(EditBox::InputMode inputMode);
virtual void setInputFlag(EditBox::InputFlag inputFlag);
virtual void setMaxLength(int maxLength);
virtual void setTextHorizontalAlignment(cocos2d::TextHAlignment alignment) { };
virtual int getMaxLength();
virtual void setReturnType(EditBox::KeyboardReturnType returnType);
virtual bool isEditing();

3
tests/cpp-tests/Classes/WindowTest/WindowTest.cpp
View File

@ -1,5 +1,6 @@
#include "WindowTest.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
USING_NS_CC;
WindowTests::WindowTests() {
@ -52,3 +53,5 @@ void WindowTestFullscreen2::onEnter() {
std::string WindowTestFullscreen2::subtitle() const {
return "Fullscreen Monitor 2 (if present)";
}
#endif

3
tests/cpp-tests/Classes/WindowTest/WindowTest.h
View File

@ -1,6 +1,7 @@
#ifndef __WINDOWTEST_H__
#define __WINDOWTEST_H__
#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
#include "../BaseTest.h"
DEFINE_TEST_SUITE(WindowTests);
@ -44,3 +45,5 @@ public:
};
#endif /* __WINDOWTEST_H__ */
#endif