Module: vkd3d Branch: master Commit: 627cf50320f90c481882b2192c3f895cfd08747d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/627cf50320f90c481882b2192c3f89...
Author: Giovanni Mascellani gmascellani@codeweavers.com Date: Thu Sep 28 10:39:30 2023 +0200
vkd3d: Use CONST_VTABLE.
---
gitlab/build-mingw | 2 +- libs/vkd3d-common/blob.c | 1 + libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/gitlab/build-mingw b/gitlab/build-mingw index 59c5a928..c9d3b9f7 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 -Wno-incompatible-pointer-types -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 -Wno-incompatible-pointer-types -Werror" LDFLAGS="-static-libgcc" && \ make -j$(nproc) && \ make -j$(nproc) install DESTDIR="$PWD/destdir" || \ touch ../pipeline_failed diff --git a/libs/vkd3d-common/blob.c b/libs/vkd3d-common/blob.c index c46abb55..0f6d5a5e 100644 --- a/libs/vkd3d-common/blob.c +++ b/libs/vkd3d-common/blob.c @@ -18,6 +18,7 @@
#define COBJMACROS #define INITGUID +#define CONST_VTABLE #include "vkd3d.h" #include "vkd3d_blob.h" #include "vkd3d_debug.h" diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 89f8b15e..d20651cc 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -22,6 +22,7 @@ #define COBJMACROS #define NONAMELESSUNION #define VK_NO_PROTOTYPES +#define CONST_VTABLE
#ifdef _WIN32 # define _WIN32_WINNT 0x0600 /* for condition variables */