1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Commit Graph

64 Commits

Author SHA1 Message Date
fbbfa29030 Merge pull request #1561 from rilian-la-te/modernize-serializer-spells
VCMI: modernize lib/serializer and modernize lib/spells
2023-02-14 12:12:39 +02:00
9f55666931 rework netpacks to avoid double typeinfo 2023-02-13 20:26:39 +02:00
8661496f6c vcmi: modernize lib/serializer 2023-02-12 21:23:00 +03:00
9c59025db0 Merge master -> develop 2023-02-03 13:26:44 +02:00
b429f0bfeb Change version to 1.1.1 2023-02-03 11:25:08 +02:00
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
70786f4963 lib: remove unused header
This an unused header with empty class. Just remove it.
2023-02-02 23:50:50 +03:00
42df5626d9 Added Color class to replace SDL_Color 2023-01-30 00:12:43 +02:00
9a30484183 Point and Rect now reside in library 2023-01-20 16:11:43 +02:00
b86969909a Fixes compilation due to changes in callback interface 2023-01-20 15:18:10 +02:00
e48bd39b9c Moved road & river handlers into a separate file 2023-01-11 15:17:24 +02:00
4f3ea0d1d9 Renamed Terrain.h/cpp -> TerrainHandler.h/cpp 2023-01-10 00:01:35 +02:00
325c29da0d Merge remote-tracking branch 'vcmi/develop' into battle_improvements 2022-12-23 14:51:34 +02:00
9248e06ae0 Demon summon is now a spell. DEMON_SUMMONING bonus has been removed 2022-12-22 23:11:55 +02:00
7b2b3bd065 Bump version 2022-12-16 17:12:36 +04:00
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
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
6ef480971d Move version definition into a separate cmake file 2022-10-22 20:48:38 +03:00
e0e075df77 [Conan] save install folder to CMake variable 2022-10-22 16:59:45 +03:00
c2cc801f60 Merge pull request #1073 from kambala-decapitator/ios-conan
[Conan] add iOS support, bump dependencies, improvements
2022-10-22 12:40:48 +03:00
f10e5e3b99 [Conan] add iOS support 2022-10-16 13:25:38 +03:00
82a9f82e1c BattleAI: retreat 2022-10-14 12:00:56 +03:00
8f599ed043 NKAI: android fixes 2022-10-03 09:01:15 +03:00
380100f90b compile Version.cpp only when ENABLE_GITVERSION is ON
Co-authored-by: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
2022-09-26 23:04:05 +03:00
e1c9903a45 extract iOS helpers into a shared lib 2022-09-24 15:55:24 +03:00
7631e7ef06 move linking to system frameworks to appropriate Find* scripts 2022-09-24 15:55:23 +03:00
4452ddb404 fix typo in FindFFmpeg 2022-09-24 15:55:23 +03:00
5e838008df merge launcher and client
launcher is a static lib now
2022-09-24 15:55:22 +03:00
6642592567 install main lib only if it's shared 2022-09-24 15:55:22 +03:00
0a1f824add fix installing shared Boost libraries 2022-09-24 15:55:21 +03:00
2d3002bc1d add standard lib target back
- the moved CMakeLists.txt is turned into a macro (adds whitespace difference)
- now uses absolute paths to the lib and include dirs
- refactors iOS install section to use "early continue" in the foreach loop
2022-09-24 15:55:21 +03:00
267e8df7db move lib/CMakeLists.txt to cmake_modules/VCMI_lib.cmake
preparation to be able to duplicate the lib target
2022-09-24 15:55:21 +03:00
b824a90295 initial iOS support to fix building
tested with Xcode and Unix Makefiles
2022-09-24 15:55:15 +03:00
188607b05f Replace cotire with CMake builtin precompiled headers support (Requires CMake version >= 3.16) 2022-06-17 17:20:08 +03:00
8fc14369a4 CMake presets. (#744)
* CI: use single build action
* CMake: use imported targets
* CI: do not build boost for linux
* CMake: add FORCE_BUNDLED_MINIZIP option
* linux: use external minizip and fuzzylite
* CMake: add presets
* .gitignore: ignore cmake build dirs
* github: use cmake presets
2022-05-26 08:55:20 +03:00
b00a1dee28 Fix build 2021-07-26 21:02:50 +03:00
b4241670ba Nullkiller: rename VCAI to AIGateway 2021-07-26 21:02:50 +03:00
ecaa9f5d0b Entities redesign and a few ERM features
* Made most Handlers derived from CHandlerBase and moved service API there.
* Declared existing Entity APIs.
* Added basic script context caching
* Started Lua script module
* Started Lua spell effect API
* Started script state persistence
* Started battle info callback binding
* CommitPackage removed
* Extracted spells::Caster to own header; Expanded Spell API.
* implemented !!MC:S, !!FU:E, !!FU:P, !!MA, !!VR:H, !!VR:C
* !!BU:C, !!BU:E, !!BU:G, !!BU:M implemented
* Allow use of "MC:S@varName@" to declare normal variable (technically v-variable with string key)
* Re-enabled VERM macros.
* !?GM0 added
* !?TM implemented
* Added !!MF:N
* Started !?OB, !!BM, !!HE, !!OW, !!UN
* Added basic support of w-variables
* Added support for ERM indirect variables
* Made !?FU regular trigger
* !!re (ERA loop receiver) implemented
* Fixed ERM receivers with zero args.
2021-02-14 19:05:43 +03:00
3c1c72319b CMake: update version on each compiling 2018-02-11 13:52:29 +03:00
610740011c CMake: print useful debug information on every build
That way we don't need to ask more questions regarding system where build failed.
2017-09-06 13:15:49 +03:00
2b3a467728 CMake: structure changes and other small improvements
- Now cmake_minimum_required used properly and set to 2.8.12
- cmake_modules/CMakeCPackOptions.cmake.in is removed
2017-08-16 16:10:08 +03:00
40af43c46e CMake: massive rework for Mac build and other improvements
- macOS: RPATH-related code all removed or disabled
- macOS: new osx/CMakeLists.txt to run some install-code running after all subdirectories
- Assets copying into the runtime output directory implemented for Mac and Linux development
2017-08-16 16:10:07 +03:00
7dca95c8cc CMake: multiple improvements for builds and project generation
- Change default build output directory name from "build" to "bin"
- Implement new function vcmi_get_cmake_debug_info
- Link client with SDL2main on Windows and disable debug console
- Remove all old MinGW-specific options since they outdated and MXE work fine
- Set AUTOGEN_TARGETS_FOLDER for better Xcode and Visual Studio projects
- Remove useless vcmitestFiles custom target for less garbage in project files
2017-08-16 16:10:07 +03:00
56f89270db macOS: full rework of Mac packaging process
- Most of outdated CMakeLists code removed.
- All Mac-specific code is removed include Sparkle support and vcmibuilder app.
- DMG buidling reimplemented using macdeployqt command.
2017-08-16 16:10:07 +03:00
193f492b99 CMake: cleanup, project generation and other improvements
- Use EXCLUDE_FROM_ALL for FuzzyLite and GoogleTest to avoid inclusion of unneded headers and libraries into installers.
- Set minimum CMake version only in main CMakeLists.txt
- Set project name only in main CMakeLists.txt
- Visual Studio: add assign_source_group function to generate proper filesystem tree
- Visual Studio: set PROJECT_LABEL so generated projects have same names binaries on Windows
- Visual Studio: enabled USE_FOLDERS for projects grouping. This also possibly affect other IDEs.
- Added add_subdirectory_with_folder function to make sure 3rd-party libraries are affected by USE_FOLDERS.
2017-08-16 16:10:07 +03:00
b3b29cfda9 CMake: update cotire to 516d78476f 2017-08-16 16:10:07 +03:00
7069f4b416 Upgrade to fuzzylite 6.0 as a submodule 2017-08-15 16:05:49 +03:00
36b8541ab5 MacOS build fix 2017-07-07 15:20:52 +03:00
30cc2f6a01 Change the output path for cmake so all files go into the same root directory 2017-07-07 13:08:53 +03:00
da1c9cf249 Fix rebuilding everything on HEAD change 2016-10-23 16:56:53 +02:00