1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Commit Graph

27 Commits

Author SHA1 Message Date
Ivan Savenko
ccd0edf13d Changes according to review 2024-10-14 13:23:48 +00:00
Ivan Savenko
55916fad0a Fix libpng linkage - shared on all platforms other than iOS 2024-10-14 13:05:10 +00:00
Ivan Savenko
501622229d Use new prebuilts package 2024-10-14 13:05:10 +00:00
Ivan Savenko
289ed742d0 Disable unused boost_url 2024-10-14 13:05:10 +00:00
Ivan Savenko
a64f1f1232 Use newer SDL libraries 2024-10-14 13:05:10 +00:00
Simeon Manolov
cbac4d7ea7
fix error during ios build
`onetbb/2021.10.0` adds a transitive dependency for `hwloc/2.9.1`

The problem is that `hwloc` does not support mobile OS.

```
checking which OS support to include... Unsupported! (aarch64-apple-ios)
configure: WARNING: ***********************************************************
configure: WARNING: *** hwloc does not support this system.
configure: WARNING: *** hwloc will *attempt* to build (but it may not work).
configure: WARNING: *** hwloc run-time results may be reduced to showing just one processor,
configure: WARNING: *** and binding will not be supported.
configure: WARNING: *** You have been warned.
configure: WARNING: *** Pausing to give you time to read this message...
configure: WARNING: ***********************************************************
checking which CPU support to include... unknown
```

...which eventually leads to:

```
ninja: error: '/Users/simo/.conan/data/hwloc/2.9.3/_/_/package/81c684be1f19b5b5aefe294dd826377be1235f07/lib/libhwloc.so', needed by 'appleclang_15.0_cxx17_64_release/libtbbbind_2_5.3.12.dylib', missing and no known rule to make it
onetbb/2021.12.0:
onetbb/2021.12.0: ERROR: Package '9fcc0a90f088a5fd6ea9bf93b3534713b5635296' build failed
```
2024-09-15 17:37:11 +03:00
Ivan Savenko
373f8526f2 Changed options of ffmpeg in conan:
- updated options to include new options added in upstream
- enabled swresample to allow audio resampling via ffmpeg instead of
custom methods
- disabled all components other than those that are needed for vcmi
- changed required version to allow newer ffmpeg versions
- added lzma as explicit dependency (used by innoextract)
2024-08-20 19:23:50 +00:00
Simeon Manolov
601840eb5f
address code review comments 2024-07-08 00:02:01 +03:00
Simeon Manolov
41a19bcdf3
Add TBB in conanfile and CMakeLists 2024-07-03 14:17:11 +03:00
Andrey Filipenkov
d293690122 [conan] enable Qt for Android 2024-06-08 00:09:04 +03:00
Laserlicht
de9dbf0cd7 introduce innoextract 2024-04-13 17:19:47 +02:00
Andrey Filipenkov
c295c81bf2 [Conan] add validate method to catch incorrect combination of options 2023-03-02 12:09:49 +03:00
Andrey Filipenkov
970bd6ed34 adjust project for Android (except AI) 2023-03-02 12:09:47 +03:00
Andrey Filipenkov
5ba3a9a5fa [Conan] split dependencies based on project parts 2023-03-02 12:09:47 +03:00
Andrey Filipenkov
0621dce157 [Conan] add Android support 2023-03-02 12:09:47 +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
Andrey Filipenkov
453217b4bb [Conan] ignore SDL versions with broken sound 2023-01-15 17:28:09 +02:00
Andrey Filipenkov
e0e075df77 [Conan] save install folder to CMake variable 2022-10-22 16:59:45 +03:00
Andrey Filipenkov
c1ef07a5e4 [Conan] generate all configs by default
env var change: USE_CONAN_WITH_ALL_CONFIGS -> GENERATE_ONLY_BUILT_CONFIG
2022-10-18 10:12:05 +03:00
Andrey Filipenkov
cf34c8da56 [Conan] add option to use Apple system libraries as overrides 2022-10-18 10:11:37 +03:00
Andrey Filipenkov
1e8be46ced [Conan] use semver 2022-10-16 13:25:38 +03:00
Andrey Filipenkov
3a0d11b38a [Conan] add option to use default options of dependencies
this allows consuming prebuilt binaries from CCI
name: default_options_of_requirements
2022-10-16 13:25:38 +03:00
Andrey Filipenkov
77d0fa8659 [Conan] add options to control usage of FFmpeg and LuaJIT 2022-10-16 13:25:38 +03:00
Andrey Filipenkov
d0d4049158 [Conan] remove no longer needed Boost workaround 2022-10-16 13:25:38 +03:00
Andrey Filipenkov
f10e5e3b99 [Conan] add iOS support 2022-10-16 13:25:38 +03:00
Andrey Filipenkov
233997d18d [Conan] upgrade dependencies: Boost, FFmpeg, Qt, SDL, libpng 2022-10-14 16:51:11 +03:00
Andrey Filipenkov
d7650ce9c0
use Conan to make macOS CI builds for both Intel and ARM (#782)
* [CI] append platform to output artifact name if it's given
2022-08-30 17:29:00 +03:00