attempt to fix systemd clang comp

This commit is contained in:
Kae 2025-01-07 19:53:04 +11:00
parent 64df890864
commit d232fb77eb
3 changed files with 7 additions and 3 deletions

View File

@ -103,7 +103,7 @@ jobs:
build_linux:
name: Build OpenStarbound Linux x86_64
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: ${{ (github.event_name != 'workflow_dispatch') || (inputs.linux == true) }}
env:
CC: clang

View File

@ -2,8 +2,7 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"dependencies": [
"glew",
{ "name": "sdl2", "default-features": false, "features": ["wayland", "x11", "alsa"], "platform": "linux" },
{ "name": "sdl2", "platform": "!linux" },
"sdl2",
"libvorbis",
"zlib",
"freetype",

View File

@ -9,6 +9,11 @@ if(PORT MATCHES "discord-")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
if(PORT MATCHES "libsystemd")
set(VCPKG_C_FLAGS "-std=c11")
set(VCPKG_CXX_FLAGS "-std=c11")
endif()
if(PORT MATCHES "opus")
string(CONCAT VCPKG_CMAKE_CONFIGURE_OPTIONS
"-DOPUS_INSTALL_PKG_CONFIG_MODULE=OFF"