From 83a41eeb81488edb472f9c40bc7711d4abbe69f9 Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Wed, 18 Dec 2024 15:50:34 +0100 Subject: [PATCH] revert changes to build system and CI --- .github/workflows/main.yml | 4 +--- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4495a3656..dbeb3129f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: config: - name: Linux GCC os: ubuntu-24.04 - compiler: gcc-14 + compiler: gcc extra-options: -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=OFF shell: bash @@ -45,7 +45,6 @@ jobs: run: | sudo apt-get update sudo apt-get install \ - gcc-14 \ ninja-build \ libsdl2-dev \ libsdl2-net-dev \ @@ -94,7 +93,6 @@ jobs: - name: Configure env: CC: ${{ matrix.config.compiler }} - CFLAGS: -std=gnu23 run: | cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release \ -DENABLE_WERROR=ON -DENABLE_HARDENING=ON -DENABLE_LTO=ON \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d9131970..4966a10ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ project("Woof" VERSION 15.0.1 LANGUAGES C) -# set(CMAKE_C_STANDARD 99) +set(CMAKE_C_STANDARD 99) # Set a default build type if none was specified set(default_build_type "RelWithDebInfo")