nishi/milsko
1
Fork 0
mirror of https://gitea.nishi.boats/pyrite-dev/milsko synced 2026-01-04 16:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

introduce VULKAN_NO_STRING_HELPER env variable for make, in case the user doesn't have vk_enum_string_helper.h (or it doesn't work idk)

Browse Source 
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@125 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
IoIxD
2025-10-01 23:42:19 +00:00
parent bd144b1ca3
commit 327f13dc98
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
GNUmakefile
View File

@@ -16,6 +16,12 @@ ifeq ($(DEBUG),1)
CFLAGS += -g CFLAGS += -g
endif endif
ifeq ($(VULKAN_NO_STRING_HELPER),1)
VK_STRING_HELPER_DEFINE =
else
VK_STRING_HELPER_DEFINE = -DHAS_VK_ENUM_STRING_HELPER
endif
L_CFLAGS = $(CFLAGS) -fPIC -D_MILSKO L_CFLAGS = $(CFLAGS) -fPIC -D_MILSKO
L_LDFLAGS = $(LDFLAGS) L_LDFLAGS = $(LDFLAGS)
L_LIBS = $(LIBS) L_LIBS = $(LIBS)
@@ -44,7 +50,7 @@ $(error Add your platform definition)
endif endif
ifeq ($(UNIX),1) ifeq ($(UNIX),1)
L_CFLAGS += -DUSE_X11 L_CFLAGS += -DUSE_X11 $(VK_STRING_HELPER_DEFINE)
L_OBJS += src/backend/x11.o L_OBJS += src/backend/x11.o
L_LIBS += -lX11 -lXrender -lXext L_LIBS += -lX11 -lXrender -lXext
@@ -57,7 +63,7 @@ EXEC =
OPENGL = 1 OPENGL = 1
else ifeq ($(WINDOWS),1) else ifeq ($(WINDOWS),1)
L_CFLAGS += -DUSE_GDI L_CFLAGS += -DUSE_GDI $(VK_STRING_HELPER_DEFINE)
L_LDFLAGS += -Wl,--out-implib,src/libMw.lib -static-libgcc L_LDFLAGS += -Wl,--out-implib,src/libMw.lib -static-libgcc
L_OBJS += src/backend/gdi.o L_OBJS += src/backend/gdi.o
L_LIBS += -lgdi32 L_LIBS += -lgdi32

5
src/widget/vulkan.c
View File

@@ -32,8 +32,7 @@
#include <vulkan/vulkan_win32.h> #include <vulkan/vulkan_win32.h>
#endif #endif
// MinGW's copy of vulkan string helpers is just straight up busted. #ifndef HAS_VK_ENUM_STRING_HELPER
#ifndef __MINGW32__
#include <vulkan/vk_enum_string_helper.h> #include <vulkan/vk_enum_string_helper.h>
#endif #endif
@@ -60,7 +59,7 @@ MwVulkanConfig vulkan_config = {
#endif #endif
// convienence macro for handling vulkan errors // convienence macro for handling vulkan errors
#ifndef __MINGW32__ #ifndef HAS_VK_ENUM_STRING_HELPER
#define VK_CMD(func) \ #define VK_CMD(func) \
vk_res = func; \ vk_res = func; \
if(vk_res != VK_SUCCESS) { \ if(vk_res != VK_SUCCESS) { \