1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Commit Graph

295 Commits

Author SHA1 Message Date
Joakim Thorén
25be15a023 Use 'REQUIRED' instead of custom error message when ccache is not found 2023-12-29 21:54:58 +01:00
Joakim Thorén
fce3b5b83c Remove redundant find_program and if(CCACHE) - if ENABLE_CCACHE is set and the generation hasn't already failed then CCACHE is guaranteed to be set and point to a ccache binary. 2023-12-27 21:12:52 +01:00
Joakim Thorén
7b02750034 ENABLE_CCACHE option is available for all platforms 2023-12-27 21:10:56 +01:00
Ivan Savenko
63e18bbd51 Fix build 2023-12-15 18:58:03 +02:00
Andrii Danylchenko
b238796fee MSVC: attempt to get build with pdb 2023-12-03 20:20:59 +02:00
Nordsoft91
1fcbe8df5f
Merge pull request #3026 from Laserlicht/firewall_rules
install firewall rules with installer
2023-10-10 00:45:41 +02:00
Alexander Wilms
3f83d54dc1 Set ENABLE_CCACHE to OFF by default 2023-10-09 21:22:11 +02:00
Laserlicht
95f5b9c9b2
suggestion 2023-10-08 16:28:23 +02:00
Laserlicht
7b7338d7ea
install firewall rules 2023-10-08 14:02:49 +02:00
Alexander Wilms
3255b4232c Move ccache wrappers for macOS and iOS builds to apple/ dir 2023-10-06 21:08:45 +02:00
Alexander Wilms
19f8560456 Improve comment 2023-10-06 19:58:32 +02:00
Alexander Wilms
2bee8b5109 Make suggested changes 2023-10-06 19:55:40 +02:00
Alexander Wilms
4bed3c4726 Check CMAKE_GENERATOR, move iOS options to top level 2023-10-06 19:39:32 +02:00
Alexander Wilms
c5378f560e Mark ccache as required if ENABLE_CCACHE is ON, set ENABLE_CCACHE to ON by dafault instead of setting it in CMakePresets.json 2023-10-06 12:44:56 +02:00
Alexander Wilms
510fb205e7 Add CMake option for enabling ccache for IOS and MSVC build 2023-10-06 01:06:10 +02:00
Alexander Wilms
c7523326a0 Make ccache work with MSVC build 2023-10-02 12:36:47 +02:00
Alexander Wilms
d14c872164 iOS CI build: Make XCode work with ccache 2023-10-02 05:43:33 +02:00
Laserlicht
0e7f48fee0 Update CMakeLists.txt 2023-09-15 15:26:14 +02:00
Ivan Savenko
537f9fa048 Merged master into develop 2023-08-03 23:38:32 +03:00
Ivan Savenko
45cbc4d550 Added workaround for mingw CI builds failing due to TBB bug 2023-08-03 15:25:36 +03:00
Tomasz Zieliński
e74812542e Fix flag for MSVS 2023-07-01 11:34:13 +02:00
Ivan Savenko
fb739e7186 Merge beta -> develop 2023-04-26 22:48:08 +03:00
Ivan Savenko
f593c2cf6e Fixed handling of utf-8 in code on msvc 2023-04-19 23:08:21 +03:00
Ivan Savenko
63d2e6ea42 Removed no longer used code 2023-04-12 01:04:27 +03:00
Ivan Savenko
3e94ae1b2b Attempt to make macOS c++17 build 2023-04-12 01:03:14 +03:00
Ivan Savenko
2150eabfc5 Bumped C++ standard to C++17 2023-04-12 01:03:14 +03:00
Jerome Duval
518f8d69e5 Haiku patch 2023-03-27 10:10:09 +02:00
Adriankhl
4955e01ef2 Fix lldb string inspection for debug build 2023-03-06 10:00:04 +01:00
Andrey Filipenkov
2b3fac0b29 build Android as single process by default 2023-03-02 12:14:01 +03:00
Andrey Filipenkov
c31a9f7f5d ignore ENABLE_LAUNCHER and ENABLE_EDITOR options on Android 2023-03-02 12:09:49 +03:00
Andrey Filipenkov
4c19d8794d add option to compile AI code into libvcmi directly
- used on Android by default
- AI sources and libs are propagated to upper level with set(... PARENT_SCOPE)
2023-03-02 12:09:48 +03:00
Andrey Filipenkov
970bd6ed34 adjust project for Android (except AI) 2023-03-02 12:09:47 +03:00
Andrey Filipenkov
b0c109d5f7 use target from variable 2023-02-22 14:00:52 +03:00
Konstantin
cffdabf48e lib: replace SDL usage to Boost one
It is safer and header-only, and can be removed after C++23 is accepted.
There is no need for SDL in non-GUI.
2023-02-02 23:58:22 +03:00
Ivan Savenko
8e13ed74d7 CMake version bump to 3.16, removed MXE workarounds 2023-01-31 18:48:14 +02:00
Ivan Savenko
57ee9a9bf3 Merge vcmi/beta into vcmi/develop 2023-01-29 18:21:55 +02:00
Konstantin
2aaaa5a05a CMakeLists.txt: check CMAKE_SYSTEM_PROCESSOR
Check CMAKE_SYSTEM_PROCESSOR when generating NSIS package.
This allows us correctly determine install dir on Windows
2023-01-27 00:11:17 +03:00
Konstantin
30784477e0 CMakeLists.txt: strip on package if no debuginfo is requested
It significantly reduces size of the executable
2023-01-26 23:50:08 +03:00
Konstantin
d62d5a83ab CMakeLists.txt: fix compilation with latest TBB on 22.04
It has a config file only for None build type. Map this as fallback
for all build types.
2023-01-26 23:50:08 +03:00
Konstantin
a24ec53df2 vcmi: enable Conan builds for cross-compiling Win
This patch enables usage of Conan for cross-compiling Windows
builds instead of MXE.
2023-01-26 23:49:00 +03:00
Konstantin
f0cb8b63c7 lib/CGameInterface.cpp: add MinGW workaround
MinGW returns all dynamic library functions as FARPROC, which need
to be cast to actual signatures, and this casts emits
-Wcast-function-type.
So, silence it for GetProcAddress.
2023-01-26 23:49:00 +03:00
Andrey Filipenkov
9addc83a6b generate ipa file with CPack directly 2023-01-24 20:10:57 +03:00
Ivan Savenko
e78d6f9d70 Fix MXE detection check 2023-01-16 21:28:32 +02:00
Ivan Savenko
c252837b6a Fix installation of compiled QM files 2023-01-16 18:02:11 +02:00
Ivan Savenko
96141f010b Merge remote-tracking branch 'vcmi/develop' into translate_launcher 2023-01-15 23:55:49 +02:00
Ivan Savenko
0a858d9a7c
Upgrade msvc to include enet and qt translator (#1436)
- Updated MSVC prebuilt package
- Fixed build warnings
2023-01-15 23:55:24 +02:00
Ivan Savenko
246281e62a Merged vcmi/beta with vcmi/develop 2023-01-15 17:46:42 +02:00
Ivan Savenko
192e856797 merge with vcmi/develop 2023-01-11 16:47:53 +02:00
Ivan Savenko
d9aab0a847
Merge pull request #1318 from IvanSavenko/translate_mapeditor
Translate mapeditor
2023-01-09 21:25:09 +02:00
Ivan Savenko
6379c5f6fa Install additional dll on Windows to get better style for Qt 2023-01-09 18:35:14 +02:00