diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | video.cpp | 10 |
2 files changed, 9 insertions, 6 deletions
@@ -4,7 +4,7 @@ target = c2 data_dir = data shaders = $(data_dir)/triangle.csh $(data_dir)/ui.csh textures = $(data_dir)/22.tex $(data_dir)/kita.tex -packed_files = $(notdir $(shaders)) $(notdir $(textures)) +packed_files = $(shaders) $(textures) tools = qstd cfg sc objects = app.o c2.o video.o pipeline.o asset.o ui.o maths.o includes = -Iqstd @@ -32,7 +32,7 @@ convtexture: convtexture.c | qstd $(CC) $(cflags) convtexture.c $(lflags) -Lqstd -lqstd -o convtexture pack: $(packed_files) packer - ./packer pack $(data_dir) $(packed_files) + ./packer pack $(data_dir) $(notdir $(packed_files)) data/triangle.csh: intermediate/triangle.glsl | $(data_dir) sc ./sc/sc intermediate/triangle.glsl $(data_dir)/triangle.csh @@ -81,6 +81,7 @@ clean: rm -f $(objects) rm -f $(targets) rm -f convtexture + rm -f packer make -C qstd clean make -C cfg clean make -C sc clean @@ -26,6 +26,8 @@ extern "C" { #include "glad_vk.h" +#include <string.h> + #ifdef min /* use std::min and max instead */ #undef min #endif @@ -33,6 +35,10 @@ extern "C" { #undef max #endif +#if !defined(plat_win) +#define __stdcall +#endif + const char* device_exts[] = { VK_KHR_SWAPCHAIN_EXTENSION_NAME, VK_EXT_CUSTOM_BORDER_COLOR_EXTENSION_NAME @@ -421,10 +427,6 @@ struct Shader_Vk : public Shader, public Late_Terminated { char* buf, int size ); - bool init_vertex_format( - Device_Vk* dev, - FILE* f - ); void destroy(Device_Vk* dev) override; int find_descriptor(const char* name); |