Skip to content

Commit

Permalink
GH build: don't build dhewm3ded on macOS, shut up about sprintf() on …
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
DanielGibson committed Aug 18, 2024
1 parent 6e47e8b commit 80b3392
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 4 additions & 0 deletions neo/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 80b3392

Please sign in to comment.