Merge branch 'master' into fix/gcc-15

BUILD_LINUX.md

@@ -15,7 +15,7 @@ Please read the [general build guide](BUILD.md) for information on dependencies
 
 This documentation assumes that you are running our current target distribution, which is currently Ubuntu 22.04. The target distribution is usually the latest Ubuntu LTS still receiving standard support, though we may upgrade a little sooner if we require certain newer packages. Ubuntu version numbers are date codes and standard support is 5 years, meaning that Ubuntu 22.04 leaves standard support after around 2027-04.
 
-### Install build tools:
+## Install build tools:
 
 -  First update the package cache and your system:
 ```bash
@@ -38,7 +38,7 @@ sudo apt install ./conan-*.deb
 ```
 Verify Conan was installed by running `conan --version`.
 
-### Install build dependencies:
+## Install build dependencies:
 Most dependencies will be automatically installed by Conan. This section only lists dependencies which might not be handled by Conan.
 
 - OpenGL:
@@ -73,7 +73,7 @@ sudo apt-get install -y qtbase5-dev \
 ```
 
 
-### Extra dependencies to compile Interface on a server
+## Extra dependencies to compile Interface on a server
 
 
 - Install the following:
@@ -96,7 +96,7 @@ sudo apt install python python3 python3-distro
 sudo apt install nodejs
 ```
 
-### Get code and checkout the branch you need
+## Get code and checkout the branch you need
 
 Clone this repository:
 ```bash
@@ -114,7 +114,7 @@ git fetch --tags
 git tag
 ```
 
-### Architecture support
+## Architecture support
 
 If the build is intended to be packaged for distribution, the `OVERTE_CPU_ARCHITECTURE`
 CMake variable needs to be set to an architecture specific value.
@@ -127,7 +127,7 @@ For packaging, it is recommended to set it to a different value, for example `-m
 Setting `OVERTE_CPU_ARCHITECTURE` to an empty string will use the default compiler settings and yield maximum compatibility.
 
 
-### Prepare conan
+## Prepare conan
 
 The next step is setting up conan
 
@@ -147,7 +147,7 @@ echo "tools.system.package_manager:mode = install" >> ~/.conan2/global.conf
 echo "tools.system.package_manager:sudo = True" >> ~/.conan2/global.conf
 ```
 
-### Compiling
+## Compiling
 
 Install the dependencies with conan
 ```bash
@@ -166,7 +166,7 @@ Prepare makefiles:
 cmake --preset conan-release
 ```
 
-#### Server
+### Server
 
 To compile the Domain server:
 ```bash
@@ -175,7 +175,7 @@ make domain-server assignment-client
 
 *Note: For a server, it is not necessary to compile the Interface.*
 
-#### Interface
+### Interface
 
 To compile the Interface client:
 ```bash
@@ -187,23 +187,23 @@ The commands above will compile with a single thread. If you have enough memory,
 make -j4 interface
 ```
 
-### Running the software
+## Running the software
 
-#### Domain server
+### Domain server
 
 Running Domain server:
 ```bash
 ./domain-server/domain-server
 ```
 
-#### Assignment clients
+### Assignment clients
 
 Running assignment client:
 ```bash
 ./assignment-client/assignment-client -n 6
 ```
 
-#### Interface
+### Interface
 
 Running Interface:
 ```bash

BUILD_WIN.md

@@ -74,6 +74,8 @@ To create this variable:
 * Set "Variable name" to `CONAN_HOME`
 * Set "Variable value" to any directory that you have control over.
 
+*Make sure that you copy the contents of your old `.conan2` folder over, or that you add the remote from step 2 again.*
+
 ## Step 7. Running CMake to Generate Build Files
 
 These instructions only apply to Visual Studio 2019.

conanfile.py

@@ -78,6 +78,8 @@ 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)
+        # Fixes build errors on GCC 15. Check if this is still required when upgrading from sdl/2.30.3.
+        # https://github.com/conan-io/conan-center-index/issues/27265
         self.requires("libiconv/1.18", force=True)
         openssl = "openssl/1.1.1q"
 

tools/conan-profiles/vs-19-debug

@@ -2,6 +2,7 @@
 os=Windows
 arch=x86_64
 compiler=msvc
+compiler.cppstd=17
 compiler.version=192
 compiler.runtime=dynamic
 compiler.runtime_type=Debug

tools/conan-profiles/vs-19-debug-ninja

@@ -2,6 +2,7 @@
 os=Windows
 arch=x86_64
 compiler=msvc
+compiler.cppstd=17
 compiler.version=192
 compiler.runtime=dynamic
 compiler.runtime_type=Debug

tools/conan-profiles/vs-19-release

@@ -2,6 +2,7 @@
 os=Windows
 arch=x86_64
 compiler=msvc
+compiler.cppstd=17
 compiler.version=192
 compiler.runtime=dynamic
 compiler.runtime_type=Release

tools/conan-profiles/vs-19-release-ninja

@@ -2,6 +2,7 @@
 os=Windows
 arch=x86_64
 compiler=msvc
+compiler.cppstd=17
 compiler.version=192
 compiler.runtime=dynamic
 compiler.runtime_type=Release

tools/conan-profiles/vs-19-relwithdebinfo

@@ -4,6 +4,7 @@ os_build=Windows
 arch=x86_64
 arch_build=x86_64
 compiler=Visual Studio
+compiler.cppstd=17
 compiler.version=16
 build_type=RelWithDebInfo
 # Build fails on Windows with C++17

tools/conan-profiles/vs-22-debug

@@ -2,6 +2,7 @@
 os=Windows
 arch=x86_64
 compiler=msvc
+compiler.cppstd=17
 compiler.version=194
 compiler.runtime=dynamic
 compiler.runtime_type=Debug

tools/conan-profiles/vs-22-debug-ninja

@@ -2,6 +2,7 @@
 os=Windows
 arch=x86_64
 compiler=msvc
+compiler.cppstd=17
 compiler.version=194
 compiler.runtime=dynamic
 compiler.runtime_type=Debug

tools/conan-profiles/vs-22-release

@@ -2,6 +2,7 @@
 os=Windows
 arch=x86_64
 compiler=msvc
+compiler.cppstd=17
 compiler.version=194
 compiler.runtime=dynamic
 compiler.runtime_type=Release

tools/conan-profiles/vs-22-release-ninja

@@ -2,6 +2,7 @@
 os=Windows
 arch=x86_64
 compiler=msvc
+compiler.cppstd=17
 compiler.version=194
 compiler.runtime=dynamic
 compiler.runtime_type=Release

tools/conan-profiles/vs-22-relwithdebinfo

@@ -2,6 +2,7 @@
 os=Windows
 arch=x86_64
 compiler=msvc
+compiler.cppstd=17
 compiler.version=194
 compiler.runtime=dynamic
 compiler.runtime_type=RelWithDebInfo