From 709e67a40fe8dd5ab92c3b6aa86f2414e2ab6d31 Mon Sep 17 00:00:00 2001 From: Kiritow_Bar <1362050620@qq.com> Date: Wed, 24 May 2017 03:09:27 +0800 Subject: [PATCH] Fix compile error on C4 --- MiniEngine.cpp | 5 +++++ MiniEngine_Android.cpp | 4 ++-- MiniEngine_SQLite.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/MiniEngine.cpp b/MiniEngine.cpp index 37d5156..4bcc1a1 100644 --- a/MiniEngine.cpp +++ b/MiniEngine.cpp @@ -86,6 +86,9 @@ namespace MiniEngine return SDL_WINDOW_ALLOW_HIGHDPI; case WindowType::MouseCapture: return SDL_WINDOW_MOUSE_CAPTURE; + + /// The following value are not defined on C4. + #ifndef __C4DROID__ case WindowType::AlwaysOnTop: return SDL_WINDOW_ALWAYS_ON_TOP; case WindowType::SkipTaskBar: @@ -96,6 +99,8 @@ namespace MiniEngine return SDL_WINDOW_TOOLTIP; case WindowType::PopUpMenu: return SDL_WINDOW_POPUP_MENU; + #endif // __C4DROID__ + default: return 0;/// Return 0 on default. } diff --git a/MiniEngine_Android.cpp b/MiniEngine_Android.cpp index d45630f..fba67c6 100644 --- a/MiniEngine_Android.cpp +++ b/MiniEngine_Android.cpp @@ -7,12 +7,12 @@ namespace MiniEngine #if defined(__ANDROID__) && __ANDROID__ std::string SDLSystem::Android::GetInternal() { - return string(SDL_AndroidGetInternalStoragePath()); + return std::string(SDL_AndroidGetInternalStoragePath()); } std::string SDLSystem::Android::GetExternal() { - return string(SDL_AndroidGetExternalStoragePath()); + return std::string(SDL_AndroidGetExternalStoragePath()); } bool SDLSystem::Android::CanReadExternal() diff --git a/MiniEngine_SQLite.h b/MiniEngine_SQLite.h index cc3a507..575bf0f 100644 --- a/MiniEngine_SQLite.h +++ b/MiniEngine_SQLite.h @@ -2,6 +2,7 @@ #include "sqlite/sqlite3.h" #include #include +#include namespace MiniEngine {