updated pvrtex tool to version 2, per the latest release from TapamN (KallistiOS#1145)

Co-authored-by: drxl <daniel@vmap.dk>

https://dcemulation.org/phpBB/viewtopic.php?p=1061943#p1061943

Author: dfchil

utils/pvrtex/CHANGELOG

@@ -1,16 +1,35 @@
 Based on code by TapamN
 Source released here: https://dcemulation.org/phpBB/viewtopic.php?t=106138
 
-	Version 1.0
-		Initial release
+	Version 2.00
+		Mipmaps can now be generationed optionally only if
+		texture is already square, using "--mip-resize opt".
+
+		.PVR and .DT files can be used as input files.
+
+		Custom palettes can be specified with --palette option.
+
+		Option to generate texconv style normal maps.
+
+		Added flip-v option.
+
+		Texture size is printed when --verbose is enabled.
+
+		Speed optimizations.
 
 	Version 1.01
-		Program now displays error message when an error occurs loading a source image. Previously, the program would hit an assertion.
+		Program now displays error message when an error occurs
+		loading a source image. Previously, the program would
+		hit an assertion.
 
-		Fixed "--resize down" option. Previously, the program would round down sizes that were already a power-of-two, now sizes that are already POT are left unchanged.
+		Fixed "--resize down" option. Previously, the program
+		would round down sizes that were already a power-of-two,
+		now sizes that are already POT are left unchanged.
 
 		Included a missing FFmpeg header file.
 
+	Version 1.0
+		Initial release
 ---------------------------
 
 Adaption into KOS by Daniel Fairchild, 2024

utils/pvrtex/Makefile

@@ -4,19 +4,18 @@
 TARGET = pvrtex
 OBJS = elbg.o mem.o log.o bprint.o avstring.o lfg.o crc.o md5.o stb_image_impl.o \
 	stb_image_write_impl.o stb_image_resize_impl.o optparse_impl.o pvr_texture.o \
-	dither.o tddither.o vqcompress.o mycommon.o file_common.o \
-	file_pvr.o file_tex.o file_dctex.o pvr_texture_encoder.o main.o
+	dither.o tddither.o vqcompress.o mycommon.o palette.o file_common.o \
+	file_pvr.o file_tex.o file_dctex.o pvr_texture_encoder.o pvr_texture_decoder.o main.o
 
-CPPFLAGS = -Ilibavutil -I. -DCONFIG_MEMORY_POISONING=0 -DHAVE_FAST_UNALIGNED=0
-CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare
-
-ifdef $(DEBUGBUILD)
-	CXXFLAGS += -Og -pg -g
+ifeq ($(DEBUGBUILD), true)
+OPTMODE= -Og -pg -g
 else
-	CXXFLAGS += -O3
+OPTMODE= -O3 -flto=auto -march=native
 endif
 
-CFLAGS := $(CXXFLAGS) -Wno-pointer-sign -std=gnu17
+MYFLAGS=-Wall -Wextra -Wno-unused-parameter -Wno-sign-compare -Ilibavutil -I. -DCONFIG_MEMORY_POISONING=0 -DHAVE_FAST_UNALIGNED=0
+MYCPPFLAGS=$(MYFLAGS)
+MYCFLAGS=$(MYFLAGS) -Wno-pointer-sign
 
 define textSegment2Header
 	mkdir -p info
@@ -25,15 +24,22 @@ define textSegment2Header
 	rm $2/$3.txt
 endef
 
-.PHONY: all clean
-
 all: $(TARGET) README
 
-$(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) -o $@ $^
+.PHONY: all clean install
 
 main.o: main.c info/options.h info/examples.h
 
+%.o: %.c
+	gcc $(CFLAGS) $(MYCFLAGS) $(OPTMODE) -c $< -o $@
+
+%.o: %.cpp
+	gcc $(CFLAGS) $(MYCPPFLAGS) $(CXXFLAGS) $(OPTMODE) -c $< -o $@
+
+$(TARGET): $(OBJS)
+	gcc $(OPTMODE) -o $(TARGET) \
+		$(OBJS) $(PROGMAIN) -lm -lstdc++
+
 clean:
 	rm -f $(TARGET) $(OBJS) README
 
@@ -43,8 +49,16 @@ README: readme_unformatted.txt
 install: all
 	install -m 755 $(TARGET) $(DC_TOOLS_BASE)/
 
+
 info/options.h: README Makefile
 	$(call textSegment2Header,Command Line Options:,info,options)
 
 info/examples.h: README Makefile
 	$(call textSegment2Header,Usage Examples:,info,examples)
+
+bash-completion-dir: 
+	mkdir -p ~/.local/share/bash-completion/completions
+	
+
+install-bash-completion: bash-completion-dir
+	install pvrtex-completion.bash ~/.local/share/bash-completion/completions/pvrtex.bash

utils/pvrtex/approvaltest/tests/approved/-i_crate_png_-o_tests_run_texture_dt_-f_normal_-m/texture.dt

@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "config.h"
 #include "mem.h"
 #include "avassert.h"
 #include "avstring.h"

utils/pvrtex/avstring.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config.h"
+
 #include "thread.h"
 #include "avassert.h"
 #include "bswap.h"