From: Giovanni Mascellani gmascellani@codeweavers.com
--- gitlab/build-mingw | 2 +- include/vkd3d_windows.h | 1 + tests/d3d12_crosstest.h | 1 - tests/shader_runner.c | 1 - tests/shader_runner_d3d11.c | 1 - tests/shader_runner_d3d12.c | 1 - tests/shader_runner_d3d9.c | 1 - 7 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/gitlab/build-mingw b/gitlab/build-mingw index 32b5bea5..14a2f7f4 100755 --- a/gitlab/build-mingw +++ b/gitlab/build-mingw @@ -13,7 +13,7 @@ mkdir build cd build mkdir vulkan-headers cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-headers -../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-format -Wno-array-bounds -Wno-missing-prototypes -Wno-discarded-qualifiers -Werror" LDFLAGS="-static-libgcc" && \ +../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-format -Wno-array-bounds -Wno-missing-prototypes -Werror" LDFLAGS="-static-libgcc" && \ make -j$(nproc) && \ make -j$(nproc) install DESTDIR="$PWD/destdir" || \ touch ../pipeline_failed diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 7b0e972d..b35d7d0b 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -240,6 +240,7 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES;
#elif !defined(__WIDL__)
+# define CONST_VTABLE # include <windows.h>
#endif /* _WIN32 */ diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 6c0a4ef1..ab642454 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -41,7 +41,6 @@ typedef int HRESULT;
#define VK_NO_PROTOTYPES #define COBJMACROS -#define CONST_VTABLE #define INITGUID #include "vkd3d_test.h" #include "vkd3d_windows.h" diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 05edf5da..dc32a83c 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -48,7 +48,6 @@ typedef int HRESULT; #endif
#define COBJMACROS -#define CONST_VTABLE #include "config.h" #include <ctype.h> #include <errno.h> diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 25b585b1..58146629 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -21,7 +21,6 @@ #ifdef _WIN32
#define COBJMACROS -#define CONST_VTABLE #define INITGUID #define VKD3D_TEST_NO_DEFS #include <d3d11_4.h> diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index d620f1e2..88900bac 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -19,7 +19,6 @@ #include "config.h" #include <assert.h> #define COBJMACROS -#define CONST_VTABLE #define VKD3D_TEST_NO_DEFS #include "d3d12_crosstest.h" #include "shader_runner.h" diff --git a/tests/shader_runner_d3d9.c b/tests/shader_runner_d3d9.c index 0c6d3788..c27fc4e8 100644 --- a/tests/shader_runner_d3d9.c +++ b/tests/shader_runner_d3d9.c @@ -19,7 +19,6 @@ #ifdef _WIN32
#define COBJMACROS -#define CONST_VTABLE #define VKD3D_TEST_NO_DEFS #include <d3d9.h> #include "vkd3d_d3dcommon.h"