games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Backported required changes from Launcher branch

Browse Source
This commit is contained in:
Ivan Savenko 2022-12-26 23:26:19 +02:00
parent a58a0c5a0a
commit abc7c890bf
4 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CI/linux/before_install.sh
View File

@ -5,7 +5,7 @@ sudo apt-get update
# Dependencies
sudo apt-get install libboost-all-dev
sudo apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev
sudo apt-get install qtbase5-dev
sudo apt-get install qtbase5-dev
sudo apt-get install ninja-build zlib1g-dev libavformat-dev libswscale-dev libtbb-dev libluajit-5.1-dev
# Optional dependencies
sudo apt-get install libminizip-dev libfuzzylite-dev
sudo apt-get install libminizip-dev libfuzzylite-dev qttools5-dev

13
CI/mxe/before_install.sh
View File

@ -1,12 +1,21 @@
#!/bin/sh
# steps to upgrade MXE dependencies:
# 1) Use Debian/Ubuntu system or install one (virtual machines will work too)
# 2) update following script to include any new dependencies
# You can also run it to upgrade existing ones, but don't expect much
# MXE repository only provides ancient versions for the sake of "stability"
# https://github.com/vcmi/vcmi-deps-mxe/blob/master/mirror-mxe.sh
# 3) make release in vcmi-deps-mxe repository using resulting tar archive
# 4) update paths to tar archive in this script
# Install nsis for installer creation
sudo add-apt-repository 'deb http://security.ubuntu.com/ubuntu bionic-security main'
sudo apt-get install -qq nsis ninja-build libssl1.0.0
# MXE repository was too slow for Travis far too often
wget -nv https://github.com/vcmi/vcmi-deps-mxe/releases/download/2021-02-20/mxe-i686-w64-mingw32.shared-2021-01-22.tar
tar -xvf mxe-i686-w64-mingw32.shared-2021-01-22.tar
wget -nv https://github.com/vcmi/vcmi-deps-mxe/releases/download/2022-12-26/mxe-i686-w64-mingw32.shared-2022-12-26.tar
tar -xvf mxe-i686-w64-mingw32.shared-2022-12-26.tar
sudo dpkg -i mxe-*.deb
sudo apt-get install -f --yes

15
CMakeLists.txt
View File

@ -48,7 +48,9 @@ option(ENABLE_ERM "Enable compilation of ERM scripting module" OFF)
option(ENABLE_LUA "Enable compilation of LUA scripting module" OFF)
option(ENABLE_LAUNCHER "Enable compilation of launcher" ON)
option(ENABLE_EDITOR "Enable compilation of map editor" ON)
option(ENABLE_TRANSLATIONS "Enable generation of translations for launcher and editor" ON)
option(ENABLE_NULLKILLER_AI "Enable compilation of Nullkiller AI library" ON)
if(APPLE_IOS)
set(BUNDLE_IDENTIFIER_PREFIX "" CACHE STRING "Bundle identifier prefix")
set(APP_DISPLAY_NAME "VCMI" CACHE STRING "App name on the home screen")
@ -327,8 +329,17 @@ endif()
if(ENABLE_LAUNCHER OR ENABLE_EDITOR)
# Widgets finds its own dependencies (QtGui and QtCore).
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets Network)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Network)
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets Network )
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Network )
find_package(QT NAMES Qt6 Qt5 COMPONENTS LinguistTools )
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS LinguistTools)
if (NOT Qt5LinguistTools_DIR)
set(ENABLE_TRANSLATIONS OFF)
endif()
if (ENABLE_TRANSLATIONS)
add_definitions(-DENABLE_QT_TRANSLATIONS)
endif()
endif()
if(ENABLE_NULLKILLER_AI)

6
config/schemas/settings.json
View File

@ -17,7 +17,7 @@
"type" : "object",
"default": {},
"additionalProperties" : false,
"required" : [ "playerName", "showfps", "music", "sound", "encoding", "swipe", "saveRandomMaps", "saveFrequency", "notifications", "extraDump" ],
"required" : [ "playerName", "showfps", "music", "sound", "encoding", "language", "swipe", "saveRandomMaps", "saveFrequency", "notifications", "extraDump" ],
"properties" : {
"playerName" : {
"type":"string",
@ -51,6 +51,10 @@
"type":"string",
"default" : "Maps/Arrogance"
},
"language" : {
"type":"string",
"default" : "english"
},
"lastSave" : {
"type":"string",
"default" : "NEWGAME"