Catcrafts/Crafter.Graphics
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

windows build fixes

Browse source
This commit is contained in:
Jorijn van der Graaf 2026-03-01 18:03:07 +01:00
commit 732200a461
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
interfaces/Crafter.Graphics-Window.cppm
View file

@ -40,7 +40,7 @@ module;
#include <wayland-client-protocol.h> #include <wayland-client-protocol.h>
#endif #endif
#ifdef CRAFTER_GRAPHICS_VULKAN #ifdef CRAFTER_GRAPHICS_VULKAN
#ifndef CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_w64_mingw32 #ifndef CRAFTER_GRAPHICS_WINDOWS
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
@ -282,7 +282,7 @@ export namespace Crafter {
// Command buffer submission and execution // Command buffer submission and execution
VkSemaphore renderComplete; 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 { class WindowVulkan final : public Window, public WindowKeyboard, public WindowMouse, public WindowTitle {
public: public:
WindowVulkan(std::uint32_t width, std::uint32_t height); WindowVulkan(std::uint32_t width, std::uint32_t height);

11
project.json
View file

@ -42,6 +42,9 @@
"defines": [ "defines": [
{ {
"name": "CRAFTER_GRAPHICS_VULKAN" "name": "CRAFTER_GRAPHICS_VULKAN"
},
{
"name": "CRAFTER_GRAPHICS_WINDOWS"
} }
] ]
}, },
@ -111,24 +114,18 @@
{ {
"name": "lib-vulkan-windows", "name": "lib-vulkan-windows",
"extends": ["vulkan-windows", "deps"], "extends": ["vulkan-windows", "deps"],
"type": "library", "type": "library"
"target": "x86_64-w64-mingw32",
"march": "x86-64"
}, },
{ {
"name": "lib-vulkan-windows-debug", "name": "lib-vulkan-windows-debug",
"extends": ["vulkan-windows", "deps-debug"], "extends": ["vulkan-windows", "deps-debug"],
"type": "library", "type": "library",
"target": "x86_64-w64-mingw32",
"march": "x86-64",
"debug": true "debug": true
}, },
{ {
"name": "lib-vulkan-windows-timing", "name": "lib-vulkan-windows-timing",
"extends": ["vulkan-windows", "deps-timing"], "extends": ["vulkan-windows", "deps-timing"],
"type": "library", "type": "library",
"target": "x86_64-w64-mingw32",
"march": "x86-64",
"defines": [{ "name": "CRAFTER_TIMING" }] "defines": [{ "name": "CRAFTER_TIMING" }]
}, },
{ {