From 5c6335f9fbb77f4ae18a3c6e877efdde1c17e364 Mon Sep 17 00:00:00 2001 From: Roman971 <32455037+Roman971@users.noreply.github.com> Date: Fri, 8 Jan 2021 23:42:05 +0100 Subject: [PATCH] Remove touchasset.py to improve build performance (#611) --- Makefile | 12 +----------- tools/touchasset.py | 13 ------------- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 tools/touchasset.py diff --git a/Makefile b/Makefile index fe92cad2cc..2f11644ad0 100644 --- a/Makefile +++ b/Makefile @@ -244,41 +244,31 @@ assets/%.c: assets/%.xml $(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o build/$(@:.c=.o) $@ build/%.rgba32.inc.c: %.rgba32.png - python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) $(ZAPD) btex -tt rgba32 -i $< -o $@ build/%.rgb5a1.inc.c: %.rgb5a1.png - python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) $(ZAPD) btex -tt rgb5a1 -i $< -o $@ build/%.i4.inc.c: %.i4.png - python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) $(ZAPD) btex -tt i4 -i $< -o $@ build/%.i8.inc.c: %.i8.png - python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) $(ZAPD) btex -tt i8 -i $< -o $@ build/%.ia4.inc.c: %.ia4.png - python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) $(ZAPD) btex -tt ia4 -i $< -o $@ build/%.ia8.inc.c: %.ia8.png - python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) $(ZAPD) btex -tt ia8 -i $< -o $@ build/%.ia16.inc.c: %.ia16.png - python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) $(ZAPD) btex -tt ia16 -i $< -o $@ -build/assets/%.ci4.inc.c: assets/%.ci4.png - python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) +build/%.ci4.inc.c: %.ci4.png $(ZAPD) btex -tt ci4 -i $< -o $@ build/%.ci8.inc.c: %.ci8.png - python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) $(ZAPD) btex -tt ci8 -i $< -o $@ build/assets/%.bin.inc.c: assets/%.bin - python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) $(ZAPD) bblb -i $< -o $@ diff --git a/tools/touchasset.py b/tools/touchasset.py deleted file mode 100644 index 2ef98a9c01..0000000000 --- a/tools/touchasset.py +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/python3 -import sys -import os -from os import path - -if (path.exists(sys.argv[1])): - f = open(sys.argv[1], "r") - text = f.read() - f.close() - - execStr = "touch " + text - print(execStr) - os.system(execStr) \ No newline at end of file