Rename fconv to pxfconv

examples/PoolBox/assets/Makefile

@@ -41,23 +41,23 @@ JabyTails_FLAGS = $(CLUT_4_COLOR_TRANS_FLAGS)
 
 $(OUTPUT_DIR)/fox.xa: audio/temp/fox.wav
 	@mkdir -p $(OUTPUT_DIR)
-	fileconv $< -o $@ xa
+	psxfileconv $< -o $@ xa
 
 $(OUTPUT_DIR)/%.vag: audio/temp/%.wav
 	@mkdir -p $(OUTPUT_DIR)
-	fileconv --lz4 $< -o $@ vag
+	psxfileconv --lz4 $< -o $@ vag
 
 $(OUTPUT_DIR)/%.vag2: audio/temp/%.wav
 	@mkdir -p $(OUTPUT_DIR)
-	fileconv --lz4 $< -o $@ my-vag
+	psxfileconv --lz4 $< -o $@ my-vag
 
 $(OUTPUT_DIR)/%.xa: audio/%.wav
 	@mkdir -p $(OUTPUT_DIR)
-	fileconv $< -o $@ xa
+	psxfileconv $< -o $@ xa
 
 $(OUTPUT_DIR)/%.img: %.png
 	@mkdir -p $(OUTPUT_DIR)
-	fileconv --lz4 $< -o $@ $($*_FLAGS)
+	psxfileconv --lz4 $< -o $@ $($*_FLAGS)
 
 all: $(INPUT)
 

src/Library/Makefile

@@ -36,10 +36,10 @@ $(LIB_DIR)/$(ARTIFACT).a: $(TARGET).a
 # TODO: Improve later
 # rule to make the boot image
 $(SPLASH_IMAGE): ressources/Splash.png
-	fileconv --lz4 $< simple-tim full16 | cpp_out --name SplashScreen -o $@	
+	psxfileconv --lz4 $< simple-tim full16 | cpp_out --name SplashScreen -o $@	
 
 $(SPLASH_IMAGE_NTSC): ressources/Splash_ntsc.png
-	fileconv --lz4 $< simple-tim full16 | cpp_out --name SplashScreen -o $@	
+	psxfileconv --lz4 $< simple-tim full16 | cpp_out --name SplashScreen -o $@	
 
 #Rules section for default compilation and linking
 all: $(SPLASH_IMAGE) $(SPLASH_IMAGE_NTSC) $(LIB_DIR)/$(ARTIFACT).a 

src/Tools/Makefile

@@ -1,4 +1,4 @@
-PROJECTS = cpp_out fileconv mkoverlay psxcdgen_ex psxreadmap wslpath
+PROJECTS = cpp_out psxfileconv mkoverlay psxcdgen_ex psxreadmap wslpath
 .PHONY: $(PROJECTS)
 
 $(foreach var,$(PROJECTS),$(var)):

src/Tools/Tests/Test.mk

@@ -4,7 +4,7 @@ test_cpp_out: always
 	@echo "Planschbecken" | ./../cpp_out/target/x86_64-unknown-linux-gnu/release/cpp_out --name Dino -o "Test_Planschbecken.cpp"
 	@echo "Planschbecken" | ./../cpp_out/target/x86_64-unknown-linux-gnu/release/cpp_out --name Dino -o "Test_Planschbecken.hpp"
 
-test_fileconv: always
-#	@./../fileconv/target/x86_64-unknown-linux-musl/release/fileconv -o Test_Planschi.bin Test_PNG.PNG simple-tim full16
-	@./../fileconv/target/x86_64-unknown-linux-gnu/release/fileconv --lz4 -o Test_Planschi.bin ../../Library/ressources/Splash.PNG simple-tim full16
+test_psxfileconv: always
+#	@./../psxfileconv/target/x86_64-unknown-linux-musl/release/psxfileconv -o Test_Planschi.bin Test_PNG.PNG simple-tim full16
+	@./../psxfileconv/target/x86_64-unknown-linux-gnu/release/psxfileconv --lz4 -o Test_Planschi.bin ../../Library/ressources/Splash.PNG simple-tim full16
 always: ;

src/Tools/Tools.code-workspace

@@ -8,19 +8,19 @@
         "cargo_task": [
             "./ all!Unix: All",
             "cpp_out all!Unix: cpp_out",
-            "fileconv all!Unix: fileconv",
             "mkoverlay all!Unix: mkoverlay",
             "psxcdgen_ex all!Unix: psxcdgen_ex",
             "psxcdread all!Unix: psxcdread",
+            "psxfileconv all!Unix: psxfileconv",
             "psxreadmap all!Unix: psxreadmap",
             "wslpath all!Unix: wslpath",
 
             "./ all-windows!Windows: All",
             "cpp_out all-windows!Windows: cpp_out",
-            "fileconv all-windows!Windows: fileconv",
             "mkoverlay all-windows!Windows: mkoverlay",
             "psxcdgen_ex all-windows!Windows: psxcdgen_ex",
             "psxcdread all-windows!Windows: psxcdread",
+            "psxfileconv all-windows!Windows: psxfileconv",
             "psxreadmap all-windows!Windows: psxreadmap",
             "wslpath all-windows!Windows: wslpath"
         ]

src/Tools/psxfileconv/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "fileconv"
+name = "psxfileconv"
 version = "0.5.0"
 edition = "2021"
 

src/Tools/psxfileconv/Makefile

@@ -1,6 +1,6 @@
 include ../Common.mk
 
-ARTIFACT = fileconv
+ARTIFACT = psxfileconv
 
 .PHONY: $(WINDOWS_ARTIFACT) $(UNIX_ARTIFACT)
 $(WINDOWS_ARTIFACT):

src/Tools/psxfileconv/src/main.rs

@@ -1,5 +1,5 @@
 use clap::{Parser, Subcommand};
-use fileconv::{audio::{self, *}, images::*, nothing};
+use psxfileconv::{audio::{self, *}, images::*, nothing};
 use std::path::PathBuf;
 use tool_helper::{exit_with_error, print_warning, Error};
 

support/src/FontWriter/Makefile

@@ -21,7 +21,7 @@ LIB_OBJS = $(filter-out $(MAIN_BOOT_OBJ) $(OVERLAY_BOOT_OBJ),$(OBJS))
 #$(info $$var2 is [${LIB_OBJS}])
 
 $(DEFAULT_FONT_IMAGE): ressources/DefaultFont.png
-	fileconv --lz4 $< simple-tim clut4 --semi-trans --color-trans | cpp_out --name default_font_data -o $@
+	psxfileconv --lz4 $< simple-tim clut4 --semi-trans --color-trans | cpp_out --name default_font_data -o $@
 
 #Linking rule
 $(TARGET).a: $(LIB_OBJS)

template/JabyEngine-PSX_Game/assets/Makefile

@@ -6,7 +6,7 @@ OUTPUT_DIR = bin
 # Create build targets like
 # $(OUTPUT_DIR)/TexturePage.bin: TexturePage.png
 # @mkdir -p $(OUTPUT_DIR)
-# fileconv --lz4 $< -o $@ simple-tim clut4
+# psxfileconv --lz4 $< -o $@ simple-tim clut4
 
 all: #$(OUTPUT_DIR)/TexturePage.bin