From c9d1e4cd082d6c0c7c061e6d274d9538b7e1235a Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 6 Jun 2025 22:11:08 -0500 Subject: [PATCH] Add user-setup script overrides for Linux --- .gitignore | 3 +++ tools/lib/setup-common.sh | 5 +++++ tools/lib/user-setup.example.sh | 10 ++++++++++ 3 files changed, 18 insertions(+) create mode 100644 tools/lib/user-setup.example.sh diff --git a/.gitignore b/.gitignore index 60da0eda..cb46cec7 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ _deps # Python Virtual Environment .venv/ + +# Specific excludes for Supercell Wx +tools/lib/user-setup.sh diff --git a/tools/lib/setup-common.sh b/tools/lib/setup-common.sh index 76c5230e..e28978e9 100755 --- a/tools/lib/setup-common.sh +++ b/tools/lib/setup-common.sh @@ -4,6 +4,11 @@ script_dir="$(dirname "$(readlink -f "$0")")" # Import common paths source "${script_dir}/common-paths.sh" +# Load custom build settings +if [ -f "${script_dir}/user-setup.sh" ]; then + source "${script_dir}/user-setup.sh" +fi + # Activate Python Virtual Environment if [ -n "${venv_path:-}" ]; then python -m venv "${venv_path}" diff --git a/tools/lib/user-setup.example.sh b/tools/lib/user-setup.example.sh new file mode 100644 index 00000000..5ea76d24 --- /dev/null +++ b/tools/lib/user-setup.example.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +# Example user setup script. Copy as user-setup.sh and modify as required. + +# gcc-13 is not the default gcc version +export CC=/usr/bin/gcc-13 +export CXX=/usr/bin/c++-13 + +# Override conan profile to be gcc-13 +export conan_profile=scwx-linux_gcc-13