From 0800056a7634cafb05eb7eec3b8d7fcec755e15c Mon Sep 17 00:00:00 2001 From: sam Date: Sun, 18 Aug 2024 13:06:00 +1200 Subject: [PATCH] add .exe for windows --- .gitignore | 1 + Makefile | 1 + src/main.c | 8 +++++++- src/sokol/sokol.c | 2 -- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 052ee31..ebcd110 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .cache/ .session.vim gear +*.exe compile_commands.json **/*.o **/*.glsl.h diff --git a/Makefile b/Makefile index 8c52f0a..a5e7962 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ SHADER_OBJ=$(SHADER_FILES:.glsl=.glsl.h) ifeq ($(OS), Windows_NT) CFLAGS += -DSOKOL_D3D11 + BINARY := $(BINARY).exe else UNAME_S := $(shell uname -s) ifeq ($(UNAME_S), Linux) diff --git a/src/main.c b/src/main.c index c1c5de3..e2a10e0 100644 --- a/src/main.c +++ b/src/main.c @@ -77,7 +77,13 @@ sapp_desc sokol_main(int argc, char* argv[]) { .cleanup_cb = cleanup, .width = 640, .height = 480, - .window_title = "Gear", + #ifdef SOKOL_GLCORE + .window_title = "Gear (GLCORE)", + #elif SOKOL_D3D11 + .window_title = "Gear (D3D11)", + #elif SOKOL_METAL + .window_title = "Gear (Metal)", + #endif .icon.sokol_default = true, .logger.func = slog_func, }; diff --git a/src/sokol/sokol.c b/src/sokol/sokol.c index 36c415d..70ddee0 100644 --- a/src/sokol/sokol.c +++ b/src/sokol/sokol.c @@ -1,4 +1,3 @@ -#ifndef SOKOL_METAL #define SOKOL_IMPL #include #include @@ -7,4 +6,3 @@ #include #include #include -#endif