From 8ccd3790dabfbb69aac4dd1d913f1710d89e4c85 Mon Sep 17 00:00:00 2001 From: sonoro1234 Date: Sun, 3 Sep 2023 19:19:45 +0200 Subject: [PATCH] let makefile work for mingw running on windows cmd --- src/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index 8c47a16b..2c7e1544 100644 --- a/src/Makefile +++ b/src/Makefile @@ -474,8 +474,13 @@ endif DASM_FLAGS= $(DASM_XFLAGS) $(DASM_AFLAGS) DASM_DASC= vm_$(DASM_ARCH).dasc -GIT= git -GIT_RELVER= [ -e ../.git ] && $(GIT) show -s --format=%ct >luajit_relver.txt 2>/dev/null || cat ../.relver >luajit_relver.txt 2>/dev/null || : +GIT= +ifeq (,$(HOST_MSYS)) + GIT_RELVER= if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt ) +else + GIT_RELVER= [ -e ../.git ] && $(GIT) show -s --format=%ct >luajit_relver.txt 2>/dev/null || cat ../.relver >luajit_relver.txt 2>/dev/null || : +endif + GIT_DEP= $(wildcard ../.git/HEAD ../.git/refs/heads/*) BUILDVM_O= host/buildvm.o host/buildvm_asm.o host/buildvm_peobj.o \