From 3c8fd8a2f273aec73e02ce65260c54290a9739d6 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Mon, 12 May 2025 13:18:13 +0200 Subject: [PATCH] ci: Build the demos on macOS. --- Makefile.am | 2 +- gitlab/build-mac | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 718d2850b..86fe85dc5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -540,7 +540,7 @@ EXTRA_DIST += $(vkd3d_shader_tests) if BUILD_DEMOS DEMOS_LDADD = $(LDADD) @DL_LIBS@ @DEMO_LIBS@ -DEMOS_CFLAGS = $(AM_CFLAGS) @DEMO_CFLAGS@ -Wa,-I$(srcdir)/demos +DEMOS_CFLAGS = $(AM_CFLAGS) @DEMO_CFLAGS@ -I$(srcdir)/demos -Wa,-I$(srcdir)/demos bin_PROGRAMS += $(vkd3d_demos) demos_vkd3d_gears_SOURCES = demos/gears.c demos/gears.hlsl diff --git a/gitlab/build-mac b/gitlab/build-mac index 7e54f19e7..7c92f5316 100755 --- a/gitlab/build-mac +++ b/gitlab/build-mac @@ -10,10 +10,12 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -if ../configure CFLAGS="-I/opt/homebrew/opt/vulkan-headers/include -I/opt/homebrew/opt/spirv-headers/include -g -O2 -Wno-implicit-fallthrough -Wno-ignored-attributes -Wno-unknown-attributes -Wno-unused-but-set-variable -Werror" \ +if ../configure CFLAGS="-I/opt/homebrew/opt/vulkan-headers/include -I/opt/homebrew/opt/spirv-headers/include -g -O2 -Wno-implicit-fallthrough -Wno-ignored-attributes -Wno-unknown-attributes -Wno-unused-but-set-variable -Wno-unused-command-line-argument -Werror" \ OBJCFLAGS="-g -O2 -Wno-unknown-attributes -Wno-ignored-attributes -Werror" \ CPPFLAGS="-DVKD3D_ABORT_ON_ERR -DVKD3D_SHADER_UNSUPPORTED_MSL" \ - VULKAN_LIBS=-L/opt/homebrew/opt/vulkan-loader/lib --with-spirv-tools && \ + VULKAN_LIBS=-L/opt/homebrew/opt/vulkan-loader/lib \ + --with-spirv-tools \ + --enable-demos && \ make -j$(sysctl -n hw.ncpu) ; then make -j$(sysctl -n hw.ncpu) AM_COLOR_TESTS=always check || \ touch ../tests_failed