diff options
| author | Kae <80987908+Novaenia@users.noreply.github.com> | 2025-01-07 19:53:04 +1100 |
|---|---|---|
| committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2025-01-07 19:53:04 +1100 |
| commit | d232fb77eba0dde28f1c66b343168ee5eaa5c09c (patch) | |
| tree | dbd6b1e78a2cbe91b3466685f0810271ba03197b | |
| parent | 64df8908642c8d51ad86cf3ec425253502d60bea (diff) | |
attempt to fix systemd clang comp
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | source/vcpkg.json | 3 | ||||
| -rw-r--r-- | triplets/x64-linux-mixed.cmake | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8987cd6..d152dce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/source/vcpkg.json b/source/vcpkg.json index 6eab46c..f603aab 100644 --- a/source/vcpkg.json +++ b/source/vcpkg.json @@ -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", diff --git a/triplets/x64-linux-mixed.cmake b/triplets/x64-linux-mixed.cmake index 5e93dff..06e29a7 100644 --- a/triplets/x64-linux-mixed.cmake +++ b/triplets/x64-linux-mixed.cmake @@ -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" |