From dfe99de383758fd8b368b0651cacd22bd5367c1b Mon Sep 17 00:00:00 2001 From: Bottersnike Date: Mon, 13 Jun 2022 05:28:47 +0100 Subject: [PATCH] subst workaround --- Makefile | 22 ++++++++++++++++------ meson.py | 7 +++++++ src/micetools/traces.c | 0 3 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 meson.py delete mode 100644 src/micetools/traces.c diff --git a/Makefile b/Makefile index 09290fb..d8bc160 100644 --- a/Makefile +++ b/Makefile @@ -3,24 +3,34 @@ BUILD_DIR_32 := $(BUILD_DIR)/build32 BUILD_DIR_64 := $(BUILD_DIR)/build64 DIST_DIR := dist +BUILD_DRIVE = M: + MICE_32 = "$(BUILD_DIR_32)/src\mice.exe" MICE_64 = "$(BUILD_DIR_64)/src\mice.exe" VCVARS_32 = C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\Build\\vcvars32.bat VCVARS_64 = C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat +.ONESHELL: + .PHONY: all all: mice86 dist mice86: - "$(VCVARS_32)" \ - & meson setup --backend ninja --cross cross-32.ini $(BUILD_DIR_32) \ - & meson compile -C $(BUILD_DIR_32) + @subst $(BUILD_DRIVE) . + @cd /D $(BUILD_DRIVE) \ + & "$(VCVARS_32)" \ + & meson setup --cross cross-32.ini $(BUILD_DRIVE)\$(BUILD_DIR_32) \ + & meson compile -C $(BUILD_DRIVE)\$(BUILD_DIR_32) + @subst $(BUILD_DRIVE) /D mice64: - "$(VCVARS_64)" \ - & meson setup --cross cross-64.ini $(BUILD_DIR_64) \ - & meson compile -C $(BUILD_DIR_64) + @subst $(BUILD_DRIVE) . + @cd $(BUILD_DRIVE) \ + & "$(VCVARS_64)" \ + & meson setup --cross cross-64.ini $(BUILD_DRIVE)\$(BUILD_DIR_64) \ + & meson compile -C $(BUILD_DRIVE)\$(BUILD_DIR_64) + @subst $(BUILD_DRIVE) /D .PHONY: clean clean: diff --git a/meson.py b/meson.py new file mode 100644 index 0000000..5125c0a --- /dev/null +++ b/meson.py @@ -0,0 +1,7 @@ +import os +from mesonbuild import mesonmain + +# https://bugs.python.org/issue36112 +os.path.realpath = lambda path: path + +mesonmain.main() diff --git a/src/micetools/traces.c b/src/micetools/traces.c deleted file mode 100644 index e69de29..0000000