games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-23 12:08:45 +02:00
Code Issues Releases Activity

Port to OpenDingux handhelds

Browse Source
This commit is contained in:
Hennadii Chernyshchyk 2022-12-13 03:55:54 +02:00
parent ed70c69a2b
commit de33eb44f9
No known key found for this signature in database
GPG Key ID: 24623302B8395825
6 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AI/CMakeLists.txt
View File

@ -40,4 +40,6 @@ add_subdirectory(BattleAI)
add_subdirectory(StupidAI) add_subdirectory(StupidAI)
add_subdirectory(EmptyAI) add_subdirectory(EmptyAI)
add_subdirectory(VCAI) add_subdirectory(VCAI)
add_subdirectory(Nullkiller) if(TBB_FOUND)
add_subdirectory(Nullkiller)
endif()

2
CMakeLists.txt
View File

@ -312,7 +312,7 @@ find_package(SDL2_ttf REQUIRED)
if(TARGET SDL2_ttf::SDL2_ttf) if(TARGET SDL2_ttf::SDL2_ttf)
add_library(SDL2::TTF ALIAS SDL2_ttf::SDL2_ttf) add_library(SDL2::TTF ALIAS SDL2_ttf::SDL2_ttf)
endif() endif()
find_package(TBB REQUIRED) find_package(TBB)
if(ENABLE_LAUNCHER OR ENABLE_EDITOR) if(ENABLE_LAUNCHER OR ENABLE_EDITOR)
# Widgets finds its own dependencies (QtGui and QtCore). # Widgets finds its own dependencies (QtGui and QtCore).

1
client/CMT.cpp
View File

@ -1085,7 +1085,6 @@ static bool recreateWindow(int w, int h, int bpp, bool fullscreen, int displayIn
if(!checkVideoMode(displayIndex, w, h)) if(!checkVideoMode(displayIndex, w, h))
{ {
logGlobal->error("Error: SDL says that %dx%d resolution is not available!", w, h); logGlobal->error("Error: SDL says that %dx%d resolution is not available!", w, h);
return false;
} }
#endif #endif

5
client/CMakeLists.txt
View File

@ -177,7 +177,10 @@ else()
add_executable(vcmiclient WIN32 ${client_SRCS} ${client_HEADERS} ${client_ICON}) add_executable(vcmiclient WIN32 ${client_SRCS} ${client_HEADERS} ${client_ICON})
endif(ENABLE_DEBUG_CONSOLE) endif(ENABLE_DEBUG_CONSOLE)
add_dependencies(vcmiclient vcmiserver BattleAI StupidAI VCAI Nullkiller) add_dependencies(vcmiclient vcmiserver BattleAI StupidAI VCAI)
if(TBB_FOUND)
add_dependencies(vcmiclient Nullkiller)
endif()
if(APPLE_IOS) if(APPLE_IOS)
if(ENABLE_ERM) if(ENABLE_ERM)
add_dependencies(vcmiclient vcmiERM) add_dependencies(vcmiclient vcmiERM)

6
lib/CModHandler.h
View File

@ -14,6 +14,12 @@
#include "VCMI_Lib.h" #include "VCMI_Lib.h"
#include "JsonNode.h" #include "JsonNode.h"
#ifdef __UCLIBC__
#undef major
#undef minor
#undef patch
#endif
VCMI_LIB_NAMESPACE_BEGIN VCMI_LIB_NAMESPACE_BEGIN
class CModHandler; class CModHandler;

6
server/CVCMIServer.cpp
View File

@ -55,7 +55,7 @@
#include "../lib/CGameState.h" #include "../lib/CGameState.h"
#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(VCMI_ANDROID) && !defined(VCMI_IOS) #if defined(__GNUC__) && !defined(__UCLIBC__) && !defined(__MINGW32__) && !defined(VCMI_ANDROID) && !defined(VCMI_IOS)
#include <execinfo.h> #include <execinfo.h>
#endif #endif
@ -958,7 +958,7 @@ ui8 CVCMIServer::getIdOfFirstUnallocatedPlayer() const
return 0; return 0;
} }
#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(VCMI_ANDROID) && !defined(VCMI_IOS) #if defined(__GNUC__) && !defined(__UCLIBC__) && !defined(__MINGW32__) && !defined(VCMI_ANDROID) && !defined(VCMI_IOS)
void handleLinuxSignal(int sig) void handleLinuxSignal(int sig)
{ {
const int STACKTRACE_SIZE = 100; const int STACKTRACE_SIZE = 100;
@ -1049,7 +1049,7 @@ int main(int argc, char * argv[])
#endif #endif
// Installs a sig sev segmentation violation handler // Installs a sig sev segmentation violation handler
// to log stacktrace // to log stacktrace
#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(VCMI_ANDROID) && !defined(VCMI_IOS) #if defined(__GNUC__) && !defined(__UCLIBC__) && !defined(__MINGW32__) && !defined(VCMI_ANDROID) && !defined(VCMI_IOS)
signal(SIGSEGV, handleLinuxSignal); signal(SIGSEGV, handleLinuxSignal);
#endif #endif