Skip to content

Commit

Permalink
Moved ver_defs.h out of obj
Browse files Browse the repository at this point in the history
Including a header file from obj folder just feels wrong.
  • Loading branch information
xtremeqg committed Sep 24, 2024
1 parent 8149746 commit 6e1341c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ docs/latex
*.Tpo
res/keeperfx_icon.ico
.header_checksum
/src/ver_defs.h
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6e1341c

Please sign in to comment.