Commit Graph
237 Commits
Author SHA1 Message Date
Ivan SavenkoandGitHub d9aab0a847 Merge pull request #1318 from IvanSavenko/translate_mapeditor
Translate mapeditor
2023-01-09 21:25:09 +02:00
Ivan Savenko a55ac6c1e2 Fix MXE build 2023-01-07 16:51:23 +02:00
Ivan Savenko 7a8d85e023 Fix formatting 2023-01-07 16:51:03 +02:00
Ivan Savenko d52b37fecb Moved strict compilation to CI-only 2023-01-05 17:37:40 +02:00
Ivan Savenko c6290c1a50 Enable strict compilation by default 2023-01-05 17:37:40 +02:00
Ivan Savenko 7b2ac670f2 Changed woring according to review 2022-12-28 22:42:34 +02:00
Ivan Savenko dd172b0ea6 Fixed formatting 2022-12-27 12:26:57 +02:00
Ivan Savenko abc7c890bf Backported required changes from Launcher branch 2022-12-26 23:26:19 +02:00
Ivan Savenko eb20a4b208 Merge remote-tracking branch 'vcmi/develop' into warnings_fix 2022-12-23 14:40:45 +02:00
Ivan Savenko f073c676f9 Merge 1.1 release into develop 2022-12-23 14:17:18 +02:00
Ivan SavenkoandGitHub b2279484fc Merge pull request #1227 from Shatur/opendingux
Port to OpenDingux handhelds
2022-12-22 16:56:55 +02:00
nordsoftandNordsoft91 4c15531a05 Fix cmake for macOS build 2022-12-21 23:08:53 +04:00
Hennadii Chernyshchyk 3f02146f87 Use different add_definitions for ENABLE_MONOLITHIC_INSTALL 2022-12-16 11:39:32 +02:00
Andrii DanylchenkoandGitHub 8c07ddbae0 Merge pull request #1204 from IvanSavenko/single_process_app_upgrade
[1.2] Single process app support for platforms other than ios
2022-12-15 12:22:24 +02:00
Hennadii Chernyshchyk d7fbd4aa66 Call install_vcpkg_imported_tgt after initializing BIN_DIR
Call it inside AI/CMakeLists.txt as it was before.
2022-12-15 12:16:28 +02:00
Hennadii Chernyshchyk 3322ad9501 Move find_package for TBB on top for consistency with other 2022-12-15 02:21:44 +02:00
Hennadii Chernyshchyk 37068a75b3 Make ENABLE_NULLKILLER_AI top level option 2022-12-15 02:18:17 +02:00
Hennadii Chernyshchyk 79a9a0b85a Fix paths for ENABLE_MONOLITHIC_INSTALL 2022-12-14 19:38:34 +02:00
Hennadii Chernyshchyk 1ccbc209a4 Add an option to disable Nullkiller AI 2022-12-13 22:16:48 +02:00
Hennadii Chernyshchyk de33eb44f9 Port to OpenDingux handhelds 2022-12-13 03:55:54 +02:00
Ivan Savenko f97d4c3630 Removed commented-out code 2022-12-12 18:50:14 +02:00
Ivan Savenko 0f2d4f119b Reverted -Werror due to new warnings in beta branch 2022-12-09 14:43:48 +02:00
Ivan Savenko 3e691d9033 Enable strict compilation by default in order for CI to use it 2022-12-09 14:17:03 +02:00
Ivan Savenko db2a40600d Fixed some of the warnings detected by CI run 2022-12-08 23:20:42 +02:00
Ivan Savenko 31ac1e4ab2 Add path to libvcmi.so into RPATH so dynamic linker can find it 2022-12-08 12:46:40 +02:00
Ivan Savenko 4d494b0941 added ENABLE_STRICT_COMPILATION CMake option that sets -werror flag 2022-12-07 23:35:57 +02:00
Ivan Savenko 2855606a88 Enabled & fixed -Woverloaded-virtual warning from gcc/cland
- fixed almost all instances of overloaded-virtual warning
- cleared up inheritance & method overrides in code affected by warning
2022-12-07 21:50:45 +02:00
Ivan Savenko 111ac36417 Cleared up warning settings, enabled -werror for gcc/clang 2022-12-07 18:08:13 +02:00
Ivan Savenko f8c67829a1 Restored single-app build to off by default 2022-12-06 22:30:34 +02:00
Ivan Savenko 2a492261e1 Fix building with cmake older than 3.12 2022-12-06 01:33:00 +02:00
Ivan Savenko bc1ba2135d TEST COMMIT, will be reverted after successful Github Action run 2022-12-06 00:02:14 +02:00
Ivan Savenko fa23965d0b Renamed for consistency BUILD_SINGLE_APP -> ENABLE_SINGLE_APP_BUILD 2022-12-06 00:00:56 +02:00
Ivan Savenko 5e37ad6836 Changes to single-app build
- client version of library is now always called vcmi, like in regular
builds (e.g. libvcmi.so)
- server version of library keeps its separate name
2022-12-05 22:57:43 +02:00
Ivan Savenko d13bbabf08 Made copying of config & mods directories on build optional
Added option COPY_CONFIG_ON_BUILD, if set to OFF then post-process
command that copies config & mods directories to build destination will
be disabled.

This command may be convenient in most cases, but when only config file is
edited CMake won't trigger this command since lib was not changed.

At least on Linux, symlinks are more reliable alternative
2022-12-05 22:26:59 +02:00
Ivan Savenko 98f6173516 BUILD_SINGLE_APP is now CMake option 2022-12-05 22:21:21 +02:00
Ivan Savenko 1e2793af3a Attempt to fix cmake with older gcc 2022-11-28 23:05:36 +02:00
Ivan Savenko f5f719b78e Enabled -Wmismatched-tags warning for gcc/clang since this apparently
lead to MSVC linker error
2022-11-28 21:46:24 +02:00
Andrey Filipenkov c20ae90973 disable tests by default 2022-11-03 11:33:17 +03:00
Andrii DanylchenkoandGitHub 11790c7c02 Merge pull request #1083 from vcmi/fix-android
Move version definition into a separate cmake file
2022-10-23 10:39:25 +03:00
Andrii Danylchenko 6ef480971d Move version definition into a separate cmake file 2022-10-22 20:48:38 +03:00
Andrey Filipenkov 002e09fa2d [macOS] set copyright to Info.plist 2022-10-22 16:52:47 +03:00
Andrey Filipenkov c9198311a1 [macOS] set bundle identifier to Info.plist 2022-10-22 16:52:27 +03:00
Andrii DanylchenkoandGitHub b43e0ff9e4 Merge pull request #972 from vcmi/cpp-map-editor
Cpp map editor
2022-10-22 12:42:27 +03:00
Andrey Filipenkov f10e5e3b99 [Conan] add iOS support 2022-10-16 13:25:38 +03:00
nordsoft 4cb31ea912 Merge remote-tracking branch 'upstream/develop' into cpp-map-editor 2022-10-08 23:24:57 +04:00
23f80c58dc Apply suggestions from code review
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
2022-10-08 22:55:15 +04:00
Andrey Filipenkov 92dd6d8c17 define app version only in CMakeLists
now it's propagated to code via macros
2022-10-04 12:29:38 +03:00
Andrey Filipenkov af1f35779d raise app version in CMakeLists 2022-10-04 11:47:29 +03:00
Andrii DanylchenkoandGitHub d07586ccf6 Merge pull request #1022 from kambala-decapitator/apple-set-app-version
[Apple] set proper app and build versions
2022-10-01 20:48:37 +03:00
Andrey Filipenkov b766edb6af [iOS] don't nest AI and scripting libs under subdirectories
3rd party signing tools may ignore such directory layout
2022-10-01 12:36:48 +03:00