games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

introduce VCMI_MOBILE macro

Browse Source
This commit is contained in:
Andrey Filipenkov
2023-02-27 13:00:13 +03:00
parent 299bf93390
commit fd56f86a84
11 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/CMT.cpp
View File

@@ -149,7 +149,7 @@ static void SDLLogCallback(void* userdata,
#if defined(VCMI_WINDOWS) && !defined(__GNUC__) && defined(VCMI_WITH_DEBUG_CONSOLE)
int wmain(int argc, wchar_t* argv[])
#elif defined(VCMI_IOS) || defined(VCMI_ANDROID)
#elif defined(VCMI_MOBILE)
int SDL_main(int argc, char *argv[])
#else
int main(int argc, char * argv[])
@@ -161,7 +161,7 @@ int main(int argc, char * argv[])
setenv("LANG", "C", 1);
#endif
#if !defined(VCMI_ANDROID) && !defined(VCMI_IOS)
#if !defined(VCMI_MOBILE)
// Correct working dir executable folder (not bundle folder) so we can use executable relative paths
boost::filesystem::current_path(boost::filesystem::system_complete(argv[0]).parent_path());
#endif
@@ -581,7 +581,7 @@ void playIntro()
}
}
#if !defined(VCMI_IOS) && !defined(VCMI_ANDROID)
#if !defined(VCMI_MOBILE)
static bool checkVideoMode(int monitorIndex, int w, int h)
{
//we only check that our desired window size fits on screen
@@ -644,7 +644,7 @@ static bool recreateWindow(int w, int h, int bpp, bool fullscreen, int displayIn
displayIndex = 0;
}
#if defined(VCMI_ANDROID) || defined(VCMI_IOS)
#if defined(VCMI_MOBILE)
SDL_GetWindowSize(mainWindow, &w, &h);
#else
if(!checkVideoMode(displayIndex, w, h))
@@ -708,7 +708,7 @@ static bool recreateWindow(int w, int h, int bpp, bool fullscreen, int displayIn
if(nullptr == mainWindow)
{
#if defined(VCMI_ANDROID) || defined(VCMI_IOS)
#if defined(VCMI_MOBILE)
auto createWindow = [displayIndex](uint32_t extraFlags) -> bool {
mainWindow = SDL_CreateWindow(NAME.c_str(), SDL_WINDOWPOS_UNDEFINED_DISPLAY(displayIndex), SDL_WINDOWPOS_UNDEFINED_DISPLAY(displayIndex), 0, 0, SDL_WINDOW_FULLSCREEN | extraFlags);
return mainWindow != nullptr;
@@ -771,7 +771,7 @@ static bool recreateWindow(int w, int h, int bpp, bool fullscreen, int displayIn
{
mainWindow = SDL_CreateWindow(NAME.c_str(), SDL_WINDOWPOS_CENTERED_DISPLAY(displayIndex),SDL_WINDOWPOS_CENTERED_DISPLAY(displayIndex), w, h, 0);
}
#endif // defined(VCMI_ANDROID) || defined(VCMI_IOS)
#endif // defined(VCMI_MOBILE)
if(nullptr == mainWindow)
{
@@ -794,7 +794,7 @@ static bool recreateWindow(int w, int h, int bpp, bool fullscreen, int displayIn
}
else
{
#if !defined(VCMI_ANDROID) && !defined(VCMI_IOS)
#if !defined(VCMI_MOBILE)
if(fullscreen)
{