From 090122491fbfad42ea6ca4a945b76cb9b580b424 Mon Sep 17 00:00:00 2001 From: MysterD Date: Sat, 1 Apr 2023 17:54:21 -0700 Subject: [PATCH] Force tools to rebuild if they weren't built before the luigi sound fix --- .gitignore | 1 + Makefile | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e816aad6..16a11c9b 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ # datadump /tools/ddump/* +/tools/*.ver # Text editor remnants *.swp diff --git a/Makefile b/Makefile index 1e98c45c..3d53b336 100644 --- a/Makefile +++ b/Makefile @@ -463,10 +463,16 @@ ifeq ($(filter clean distclean print-%,$(MAKECMDGOALS)),) endif endif - # Make tools if out of date ifeq ($(WINDOWS_AUTO_BUILDER),0) + # if the tools are out of date, clean them + TOOLS_VER_FILE := $(TOOLS_DIR)/tools-ver-1.ver + ifeq ($(wildcard $(TOOLS_VER_FILE)),) + $(info Cleaning tools...) + DUMMY != touch $(TOOLS_VER_FILE) + DUMMY != $(MAKE) -C $(TOOLS_DIR) clean >&2 + endif + $(info Building tools...) - #DUMMY != $(MAKE) -s -C $(TOOLS_DIR) $(if $(filter-out ido0,$(COMPILER)$(USE_QEMU_IRIX)),all-except-recomp,) >&2 || echo FAIL DUMMY != $(MAKE) -C $(TOOLS_DIR) >&2 || echo FAIL ifeq ($(DUMMY),FAIL) $(error Failed to build tools)