Fix compile error on C4

This commit is contained in:
Kirigaya Kazuto 2017-05-24 03:09:27 +08:00
parent 337694bd89
commit 709e67a40f
3 changed files with 8 additions and 2 deletions

View File

@ -86,6 +86,9 @@ namespace MiniEngine
return SDL_WINDOW_ALLOW_HIGHDPI; return SDL_WINDOW_ALLOW_HIGHDPI;
case WindowType::MouseCapture: case WindowType::MouseCapture:
return SDL_WINDOW_MOUSE_CAPTURE; return SDL_WINDOW_MOUSE_CAPTURE;
/// The following value are not defined on C4.
#ifndef __C4DROID__
case WindowType::AlwaysOnTop: case WindowType::AlwaysOnTop:
return SDL_WINDOW_ALWAYS_ON_TOP; return SDL_WINDOW_ALWAYS_ON_TOP;
case WindowType::SkipTaskBar: case WindowType::SkipTaskBar:
@ -96,6 +99,8 @@ namespace MiniEngine
return SDL_WINDOW_TOOLTIP; return SDL_WINDOW_TOOLTIP;
case WindowType::PopUpMenu: case WindowType::PopUpMenu:
return SDL_WINDOW_POPUP_MENU; return SDL_WINDOW_POPUP_MENU;
#endif // __C4DROID__
default: default:
return 0;/// Return 0 on default. return 0;/// Return 0 on default.
} }

View File

@ -7,12 +7,12 @@ namespace MiniEngine
#if defined(__ANDROID__) && __ANDROID__ #if defined(__ANDROID__) && __ANDROID__
std::string SDLSystem::Android::GetInternal() std::string SDLSystem::Android::GetInternal()
{ {
return string(SDL_AndroidGetInternalStoragePath()); return std::string(SDL_AndroidGetInternalStoragePath());
} }
std::string SDLSystem::Android::GetExternal() std::string SDLSystem::Android::GetExternal()
{ {
return string(SDL_AndroidGetExternalStoragePath()); return std::string(SDL_AndroidGetExternalStoragePath());
} }
bool SDLSystem::Android::CanReadExternal() bool SDLSystem::Android::CanReadExternal()

View File

@ -2,6 +2,7 @@
#include "sqlite/sqlite3.h" #include "sqlite/sqlite3.h"
#include <string> #include <string>
#include <memory> #include <memory>
#include <functional>
namespace MiniEngine namespace MiniEngine
{ {