mirror of
https://gitea.nishi.boats/pyrite-dev/milsko
synced 2026-01-10 03:13:28 +00:00
not a good fix
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@135 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
@@ -22,6 +22,8 @@ else
|
|||||||
VK_STRING_HELPER_DEFINE = -DHAS_VK_ENUM_STRING_HELPER
|
VK_STRING_HELPER_DEFINE = -DHAS_VK_ENUM_STRING_HELPER
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
CFLAGS += $(VK_STRING_HELPER_DEFINE)
|
||||||
|
|
||||||
L_CFLAGS = $(CFLAGS) -fPIC -D_MILSKO
|
L_CFLAGS = $(CFLAGS) -fPIC -D_MILSKO
|
||||||
L_LDFLAGS = $(LDFLAGS)
|
L_LDFLAGS = $(LDFLAGS)
|
||||||
L_LIBS = $(LIBS)
|
L_LIBS = $(LIBS)
|
||||||
@@ -50,7 +52,7 @@ $(error Add your platform definition)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(UNIX),1)
|
ifeq ($(UNIX),1)
|
||||||
L_CFLAGS += -DUSE_X11 $(VK_STRING_HELPER_DEFINE)
|
L_CFLAGS += -DUSE_X11
|
||||||
L_OBJS += src/backend/x11.o
|
L_OBJS += src/backend/x11.o
|
||||||
L_LIBS += -lX11 -lXrender -lXext
|
L_LIBS += -lX11 -lXrender -lXext
|
||||||
|
|
||||||
@@ -63,7 +65,7 @@ EXEC =
|
|||||||
|
|
||||||
OPENGL = 1
|
OPENGL = 1
|
||||||
else ifeq ($(WINDOWS),1)
|
else ifeq ($(WINDOWS),1)
|
||||||
L_CFLAGS += -DUSE_GDI $(VK_STRING_HELPER_DEFINE)
|
L_CFLAGS += -DUSE_GDI
|
||||||
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
|
||||||
|
|||||||
@@ -12,7 +12,17 @@
|
|||||||
|
|
||||||
#include <vulkan/vulkan.h>
|
#include <vulkan/vulkan.h>
|
||||||
#include <vulkan/vulkan_core.h>
|
#include <vulkan/vulkan_core.h>
|
||||||
|
#ifdef HAS_VK_ENUM_STRING_HELPER
|
||||||
#include <vulkan/vk_enum_string_helper.h>
|
#include <vulkan/vk_enum_string_helper.h>
|
||||||
|
#else
|
||||||
|
char buffer[512];
|
||||||
|
|
||||||
|
char* string_VkResult(VkResult res) {
|
||||||
|
sprintf(buffer, "%d", res);
|
||||||
|
|
||||||
|
return &buffer[0];
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
MwWidget window, vulkan;
|
MwWidget window, vulkan;
|
||||||
int ow = 300;
|
int ow = 300;
|
||||||
|
|||||||
Reference in New Issue
Block a user