diff --git a/.travis/deps.sh b/.travis/deps.sh index a510c5263..637ab923e 100755 --- a/.travis/deps.sh +++ b/.travis/deps.sh @@ -17,6 +17,7 @@ install_arch_linux() { sudo pacman -S --noconfirm mesa sudo pacman -S --noconfirm libsm sudo pacman -S --noconfirm cmake + sudo pacman -S --noconfirm sdl2_ttf } diff --git a/CMakeLists.txt b/CMakeLists.txt index 120da3960..e644e3ae4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,6 +82,9 @@ endif() project(simh VERSION "${SIMH_VERSION}" LANGUAGES C CXX) +## Tell cmake we need c99 because GCC 15 defaults to c23 which breaks things. +set(CMAKE_C_STANDARD 99) + include(vcpkg-setup) include(GNUInstallDirs)