From 80b339254bbdf9f86177a27c3bb7a2c0a90385b0 Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Sun, 18 Aug 2024 17:10:16 +0200 Subject: [PATCH] GH build: don't build dhewm3ded on macOS, shut up about sprintf() on macOS Somehow linking the dedicated server on macOS fails and I don't feel like trying to debug this in a github actions build.. who runs dedicated servers on mac anyway --- .github/workflows/macos.yml | 2 +- neo/CMakeLists.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 6da7e4f59..4b41318f6 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -32,7 +32,7 @@ jobs: - name: Build run: | mkdir build - cmake -DDEDICATED=ON -DOPENAL_LIBRARY="/opt/homebrew/opt/openal-soft/lib/libopenal.dylib" -DOPENAL_INCLUDE_DIR="/opt/homebrew/opt/openal-soft/include" -S neo/ -B build + cmake -DOPENAL_LIBRARY="/opt/homebrew/opt/openal-soft/lib/libopenal.dylib" -DOPENAL_INCLUDE_DIR="/opt/homebrew/opt/openal-soft/include" -S neo/ -B build cmake --build build - name: Create testbuild package run: | diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt index 8e143291a..2e0153503 100644 --- a/neo/CMakeLists.txt +++ b/neo/CMakeLists.txt @@ -313,8 +313,10 @@ if(D3_COMPILER_IS_GCC_OR_CLANG) if(FORCE_COLORED_OUTPUT) if(CMAKE_COMPILER_IS_GNUCC) + message(STATUS "Forcing GCC to output colored messages") add_compile_options (-fdiagnostics-color=always) elseif (D3_COMPILER_IS_CLANG) + message(STATUS "Forcing clang to output colored messages") add_compile_options (-fcolor-diagnostics) endif () endif () @@ -383,6 +385,8 @@ if(D3_COMPILER_IS_GCC_OR_CLANG) add_definitions(-DIOAPI_NO_64) elseif(APPLE) add_definitions(-DMACOS_X=1) + # stop spamming about sprintf() + add_compile_options(-Wno-deprecated-declarations) if(cpu STREQUAL "x86_64") add_compile_options(-arch x86_64 -mmacosx-version-min=10.7)