From fd9df0c99d21501b1c6d8df1a0857f1f642448d3 Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Tue, 18 Mar 2025 07:27:12 +0100 Subject: [PATCH] yes --- Sources/Backends/Vulkan/VulkanLoader.c | 18 ++---------------- Tests/xmake.lua | 2 +- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/Sources/Backends/Vulkan/VulkanLoader.c b/Sources/Backends/Vulkan/VulkanLoader.c index e7a4c01..51036f1 100644 --- a/Sources/Backends/Vulkan/VulkanLoader.c +++ b/Sources/Backends/Vulkan/VulkanLoader.c @@ -13,22 +13,8 @@ #ifdef PULSE_PLAT_MACOS #include // getenv -#endif - -#ifdef PULSE_PLAT_WINDOWS - typedef const char* LPCSTR; - typedef struct HINSTANCE__* HINSTANCE; - typedef HINSTANCE HMODULE; - #if defined(_MINWINDEF_) - /* minwindef.h defines FARPROC, and attempting to redefine it may conflict with -Wstrict-prototypes */ - #elif defined(_WIN64) - typedef __int64 (__stdcall* FARPROC)(void); - #else - typedef int (__stdcall* FARPROC)(void); - #endif -#endif - -#ifndef PULSE_PLAT_WINDOWS + typedef HMODULE LibModule; +#else #include typedef void* LibModule; #endif diff --git a/Tests/xmake.lua b/Tests/xmake.lua index 32efadc..1d17a41 100644 --- a/Tests/xmake.lua +++ b/Tests/xmake.lua @@ -1,7 +1,6 @@ local tests = { Vulkan = { option = "vulkan", - packages = { "nzsl" }, global_custom = function() add_repositories("nazara-engine-repo https://github.com/NazaraEngine/xmake-repo") add_requires("nzsl >=2023.12.31", { configs = { shared = false, nzslc = true } }) @@ -80,6 +79,7 @@ local tests = { end, custom = function() add_rules("nzsl_compile_shaders") + add_packages("nzs") add_files("**.nzsl") end },