mirror of
https://github.com/overte-org/overte.git
synced 2025-08-04 07:23:39 +02:00
Fixes for building on Arch/GCC 15
This commit is contained in:
parent
567b66c257
commit
729101de8f
3 changed files with 12 additions and 5 deletions
|
@ -155,6 +155,12 @@ cd overte
|
|||
conan install . -s build_type=Release -b missing -pr:b=default -of build
|
||||
```
|
||||
|
||||
On systems with GCC 15 additional parameter is needed:
|
||||
```bash
|
||||
cd overte
|
||||
conan install . -s build_type=Release -b missing -pr:b=default -of build -c tools.build:cxxflags="['-include', 'cstdint']"
|
||||
```
|
||||
|
||||
Prepare makefiles:
|
||||
```bash
|
||||
cmake --preset conan-release
|
||||
|
|
|
@ -3,7 +3,7 @@ if (WIN32)
|
|||
# Building with webrtc-audio-processing on Windows fails on cppstd 14.
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
else ()
|
||||
set(CMAKE_CXX_STANDARD 14)
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
endif ()
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
|
|
|
@ -55,9 +55,9 @@ class Overte(ConanFile):
|
|||
self.requires("gifcreator/2016.11@overte/stable")
|
||||
self.requires("glad/0.1.36")
|
||||
self.requires("gli/cci.20210515")
|
||||
self.requires("glslang/1.3.236.0")
|
||||
self.requires("glslang/1.3.268.0")
|
||||
self.requires("liblo/0.30@overte/stable")
|
||||
self.requires("libnode/18.20.6@overte/stable")
|
||||
self.requires("libnode/18.20.8@overte/stable")
|
||||
self.requires("nlohmann_json/3.11.2")
|
||||
self.requires("nvidia-texture-tools/2023.01@overte/stable")
|
||||
self.requires("onetbb/2021.10.0")
|
||||
|
@ -69,8 +69,8 @@ class Overte(ConanFile):
|
|||
self.requires("quazip/1.4")
|
||||
self.requires("scribe/2019.02@overte/stable")
|
||||
self.requires("sdl/2.30.3")
|
||||
self.requires("spirv-cross/1.3.231.1")
|
||||
self.requires("spirv-tools/1.3.236.0")
|
||||
self.requires("spirv-cross/1.3.268.0")
|
||||
self.requires("spirv-tools/1.3.268.0")
|
||||
self.requires("steamworks/158a@overte/prebuild")
|
||||
self.requires("v-hacd/4.1.0")
|
||||
self.requires("vulkan-memory-allocator/3.0.1")
|
||||
|
@ -78,6 +78,7 @@ class Overte(ConanFile):
|
|||
self.requires("zlib/1.2.13")
|
||||
self.requires("glm/0.9.9.5", force=True)
|
||||
self.requires("jsoncpp/1.9.6", force=True)
|
||||
self.requires("libiconv/1.18", force=True)
|
||||
openssl = "openssl/1.1.1q"
|
||||
|
||||
if self.options.qt_source == "system":
|
||||
|
|
Loading…
Reference in a new issue