From a7cbefc5e65e8613d717d32405bcc7983e5c421d Mon Sep 17 00:00:00 2001 From: Kevin Pfeifer Date: Wed, 15 May 2024 19:43:25 +0000 Subject: [PATCH] move cmake flags to os matrix --- .github/workflows/build.yml | 2 +- build.sh | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e4e9f8..b9c56b5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: - { name: win-x86, os: windows-latest, flags: -A Win32 } - { name: win-arm64, os: windows-latest, flags: -A ARM64 } - { name: linux-x64, os: ubuntu-20.04, flags: -GNinja, target_apt_arch: ":amd64"} - - { name: linux-x86, os: ubuntu-20.04, flags: -GNinja, target_apt_arch: ":i386" } + - { name: linux-x86, os: ubuntu-20.04, flags: -GNinja -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32", target_apt_arch: ":i386" } - { name: linux-arm64, os: ubuntu-20.04, flags: -GNinja, target_apt_arch: ":arm64", container: arm64v8/ubuntu } - { name: linux-arm, os: ubuntu-20.04, flags: -GNinja, target_apt_arch: ":armhf", container: arm32v7/ubuntu } - { name: osx-x64, os: macos-latest, flags: -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.14" } diff --git a/build.sh b/build.sh index c402cdb..6931358 100755 --- a/build.sh +++ b/build.sh @@ -64,13 +64,6 @@ if [[ $RUNNER_OS == 'Linux' ]]; then libpulse-dev$TARGET_APT_ARCH fi -# Configure CMake -if [[ $NAME == 'linux-x86' ]]; then - FLAGS="$FLAGS -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32" -elif [[ $NAME == 'linux-x64' ]]; then - FLAGS="$FLAGS -DCMAKE_C_FLAGS=-m64 -DCMAKE_CXX_FLAGS=-m64" -fi - cmake -B build $FLAGS -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSDL_SHARED_ENABLED_BY_DEFAULT=ON -DSDL_STATIC_ENABLED_BY_DEFAULT=ON # Build