Rename jaby_engine_fconv to fileconv
This commit is contained in:
parent
987ac95c97
commit
2aca10953d
|
@ -40,19 +40,19 @@ JabyTails_FLAGS = $(CLUT_4_COLOR_TRANS_FLAGS)
|
|||
|
||||
$(OUTPUT_DIR)/fox.xa: audio/temp/fox.wav
|
||||
@mkdir -p $(OUTPUT_DIR)
|
||||
jaby_engine_fconv $< -o $@ xa
|
||||
fileconv $< -o $@ xa
|
||||
|
||||
$(OUTPUT_DIR)/%.vag: audio/temp/%.wav
|
||||
@mkdir -p $(OUTPUT_DIR)
|
||||
jaby_engine_fconv --lz4 $< -o $@ vag
|
||||
fileconv --lz4 $< -o $@ vag
|
||||
|
||||
$(OUTPUT_DIR)/%.xa: audio/%.wav
|
||||
@mkdir -p $(OUTPUT_DIR)
|
||||
jaby_engine_fconv $< -o $@ xa
|
||||
fileconv $< -o $@ xa
|
||||
|
||||
$(OUTPUT_DIR)/%.img: %.png
|
||||
@mkdir -p $(OUTPUT_DIR)
|
||||
jaby_engine_fconv --lz4 $< -o $@ $($*_FLAGS)
|
||||
fileconv --lz4 $< -o $@ $($*_FLAGS)
|
||||
|
||||
all: $(INPUT)
|
||||
|
||||
|
|
|
@ -33,13 +33,13 @@ $(LIB_DIR)/$(ARTIFACT).a: $(TARGET).a
|
|||
@mkdir -p $(LIB_DIR)
|
||||
cp $(TARGET).a $(LIB_DIR)/$(ARTIFACT).a
|
||||
|
||||
# Improve later
|
||||
# TODO: Improve later
|
||||
# rule to make the boot image
|
||||
$(SPLASH_IMAGE): ressources/Splash.png
|
||||
jaby_engine_fconv --lz4 $< simple-tim full16 | cpp_out --name SplashScreen -o $@
|
||||
fileconv --lz4 $< simple-tim full16 | cpp_out --name SplashScreen -o $@
|
||||
|
||||
$(SPLASH_IMAGE_NTSC): ressources/Splash_ntsc.png
|
||||
jaby_engine_fconv --lz4 $< simple-tim full16 | cpp_out --name SplashScreen -o $@
|
||||
fileconv --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
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
PROJECTS = cpp_out jaby_engine_fconv mkoverlay psxcdgen_ex psxreadmap wslpath
|
||||
PROJECTS = cpp_out fileconv mkoverlay psxcdgen_ex psxreadmap wslpath
|
||||
.PHONY: $(PROJECTS)
|
||||
|
||||
$(foreach var,$(PROJECTS),$(var)):
|
||||
|
|
|
@ -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_jaby_engine_fconv: always
|
||||
# @./../jaby_engine_fconv/target/x86_64-unknown-linux-musl/release/jaby_engine_fconv -o Test_Planschi.bin Test_PNG.PNG simple-tim full16
|
||||
@./../jaby_engine_fconv/target/x86_64-unknown-linux-gnu/release/jaby_engine_fconv --lz4 -o Test_Planschi.bin ../../Library/ressources/Splash.PNG simple-tim full16
|
||||
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
|
||||
always: ;
|
|
@ -8,7 +8,7 @@
|
|||
"cargo_task": [
|
||||
"./ all!Unix: All",
|
||||
"cpp_out all!Unix: cpp_out",
|
||||
"jaby_engine_fconv all!Unix: jaby_engine_fconv",
|
||||
"fileconv all!Unix: fileconv",
|
||||
"mkoverlay all!Unix: mkoverlay",
|
||||
"psxcdgen_ex all!Unix: psxcdgen_ex",
|
||||
"psxcdread all!Unix: psxcdread",
|
||||
|
@ -17,7 +17,7 @@
|
|||
|
||||
"./ all-windows!Windows: All",
|
||||
"cpp_out all-windows!Windows: cpp_out",
|
||||
"jaby_engine_fconv all-windows!Windows: jaby_engine_fconv",
|
||||
"fileconv all-windows!Windows: fileconv",
|
||||
"mkoverlay all-windows!Windows: mkoverlay",
|
||||
"psxcdgen_ex all-windows!Windows: psxcdgen_ex",
|
||||
"psxcdread all-windows!Windows: psxcdread",
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[package]
|
||||
name = "jaby_engine_fconv"
|
||||
name = "fileconv"
|
||||
version = "0.5.0"
|
||||
edition = "2021"
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
include ../Common.mk
|
||||
|
||||
ARTIFACT = jaby_engine_fconv
|
||||
ARTIFACT = fileconv
|
||||
|
||||
.PHONY: $(WINDOWS_ARTIFACT) $(UNIX_ARTIFACT)
|
||||
$(WINDOWS_ARTIFACT):
|
|
@ -1,5 +1,5 @@
|
|||
use clap::{Parser, Subcommand};
|
||||
use jaby_engine_fconv::{audio::*, images::*, nothing};
|
||||
use fileconv::{audio::*, images::*, nothing};
|
||||
use std::path::PathBuf;
|
||||
use tool_helper::{exit_with_error, print_warning, Error};
|
||||
|
|
@ -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
|
||||
jaby_engine_fconv --lz4 $< simple-tim clut4 --semi-trans --color-trans | cpp_out --name default_font_data -o $@
|
||||
fileconv --lz4 $< simple-tim clut4 --semi-trans --color-trans | cpp_out --name default_font_data -o $@
|
||||
|
||||
#Linking rule
|
||||
$(TARGET).a: $(LIB_OBJS)
|
||||
|
|
|
@ -6,7 +6,7 @@ OUTPUT_DIR = bin
|
|||
# Create build targets like
|
||||
# $(OUTPUT_DIR)/TexturePage.bin: TexturePage.png
|
||||
# @mkdir -p $(OUTPUT_DIR)
|
||||
# jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4
|
||||
# fileconv --lz4 $< -o $@ simple-tim clut4
|
||||
|
||||
all: #$(OUTPUT_DIR)/TexturePage.bin
|
||||
|
||||
|
|
Loading…
Reference in New Issue