From 732200a461c64be15b46f6df2beb242cf7a9049f Mon Sep 17 00:00:00 2001 From: Jorijn van der Graaf Date: Sun, 1 Mar 2026 18:03:07 +0100 Subject: [PATCH] windows build fixes --- interfaces/Crafter.Graphics-Window.cppm | 4 ++-- project.json | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/interfaces/Crafter.Graphics-Window.cppm b/interfaces/Crafter.Graphics-Window.cppm index b277371..ad4c908 100644 --- a/interfaces/Crafter.Graphics-Window.cppm +++ b/interfaces/Crafter.Graphics-Window.cppm @@ -40,7 +40,7 @@ module; #include #endif #ifdef CRAFTER_GRAPHICS_VULKAN -#ifndef CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_w64_mingw32 +#ifndef CRAFTER_GRAPHICS_WINDOWS #include #include #include @@ -282,7 +282,7 @@ export namespace Crafter { // Command buffer submission and execution VkSemaphore renderComplete; }; - #ifndef CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_w64_mingw32 + #ifndef CRAFTER_GRAPHICS_WINDOWS class WindowVulkan final : public Window, public WindowKeyboard, public WindowMouse, public WindowTitle { public: WindowVulkan(std::uint32_t width, std::uint32_t height); diff --git a/project.json b/project.json index abbb66a..fb9ed2b 100644 --- a/project.json +++ b/project.json @@ -42,6 +42,9 @@ "defines": [ { "name": "CRAFTER_GRAPHICS_VULKAN" + }, + { + "name": "CRAFTER_GRAPHICS_WINDOWS" } ] }, @@ -111,24 +114,18 @@ { "name": "lib-vulkan-windows", "extends": ["vulkan-windows", "deps"], - "type": "library", - "target": "x86_64-w64-mingw32", - "march": "x86-64" + "type": "library" }, { "name": "lib-vulkan-windows-debug", "extends": ["vulkan-windows", "deps-debug"], "type": "library", - "target": "x86_64-w64-mingw32", - "march": "x86-64", "debug": true }, { "name": "lib-vulkan-windows-timing", "extends": ["vulkan-windows", "deps-timing"], "type": "library", - "target": "x86_64-w64-mingw32", - "march": "x86-64", "defines": [{ "name": "CRAFTER_TIMING" }] }, {