From 6e1341c8bed215ed9677d9b17e36e7e7bda77f55 Mon Sep 17 00:00:00 2001 From: xtremeqg Date: Tue, 17 Sep 2024 22:24:52 +0300 Subject: [PATCH] Moved ver_defs.h out of obj Including a header file from obj folder just feels wrong. --- .gitignore | 1 + Makefile | 4 ++-- src/version.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 10e071e39f..a6c219a1cd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ docs/latex *.Tpo res/keeperfx_icon.ico .header_checksum +/src/ver_defs.h diff --git a/Makefile b/Makefile index 9fdd84538f..4dc66e837f 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ ECHO = @echo BIN = bin/keeperfx$(EXEEXT) TEST_BIN = bin/tests$(EXEEXT) # Names of intermediate build products -GENSRC = obj/ver_defs.h +GENSRC = src/ver_defs.h RES = obj/keeperfx_stdres.res LIBS = obj/enet.a @@ -566,7 +566,7 @@ res/%.ico: res/%016-08bpp.png res/%032-08bpp.png res/%048-08bpp.png res/%064-08b $(PNGTOICO) "$@" --colors 256 $(word 5,$^) $(word 4,$^) $(word 3,$^) --colors 16 $(word 2,$^) $(word 1,$^) -$(ECHO) ' ' -obj/ver_defs.h: version.mk Makefile +src/ver_defs.h: version.mk Makefile $(ECHO) \#define VER_MAJOR $(VER_MAJOR) > "$(@D)/tmp" $(ECHO) \#define VER_MINOR $(VER_MINOR) >> "$(@D)/tmp" $(ECHO) \#define VER_RELEASE $(VER_RELEASE) >> "$(@D)/tmp" diff --git a/src/version.h b/src/version.h index ac5325ca4e..cbfb9b1c90 100644 --- a/src/version.h +++ b/src/version.h @@ -24,7 +24,7 @@ #define DEBUG_NETWORK_PACKETS 0 #endif /* Version definitions */ -#include "../obj/ver_defs.h" +#include "ver_defs.h" //#define VER_MAJOR 1 //#define VER_MINOR 2 //#define VER_RELEASE 3