diff --git a/examples/PoolBox/application/src/asset_mgr.cpp b/examples/PoolBox/application/src/asset_mgr.cpp index a2efde13..e9e62d30 100644 --- a/examples/PoolBox/application/src/asset_mgr.cpp +++ b/examples/PoolBox/application/src/asset_mgr.cpp @@ -111,7 +111,7 @@ namespace Assets { namespace XAAudio { void play_fox() { - CDXA::play(lba, CDXA::CDFile{FOX_XA}, 0); + CDXA::play(lba, FOX_XA, 0, false); } } } \ No newline at end of file diff --git a/examples/PoolBox/assets/Makefile b/examples/PoolBox/assets/Makefile index b0fac76b..0d1cd2c0 100644 --- a/examples/PoolBox/assets/Makefile +++ b/examples/PoolBox/assets/Makefile @@ -2,12 +2,16 @@ include $(JABY_ENGINE_DIR)/mkfile/common/ExportPath.mk include $(JABY_ENGINE_DIR)/mkfile/common/RebuildTarget.mk OUTPUT_DIR = bin -INPUT = $(OUTPUT_DIR)/fox.xa $(OUTPUT_DIR)/TexturePage.bin $(OUTPUT_DIR)/IconTexture.bin $(OUTPUT_DIR)/Paco.bin $(OUTPUT_DIR)/Controller.bin $(OUTPUT_DIR)/doener_fish.bin $(OUTPUT_DIR)/JabyStar.bin +INPUT = $(OUTPUT_DIR)/Evacuation.xa $(OUTPUT_DIR)/fox.xa $(OUTPUT_DIR)/TexturePage.bin $(OUTPUT_DIR)/IconTexture.bin $(OUTPUT_DIR)/Paco.bin $(OUTPUT_DIR)/Controller.bin $(OUTPUT_DIR)/doener_fish.bin $(OUTPUT_DIR)/JabyStar.bin $(OUTPUT_DIR)/fox.xa: audio/temp/fox.wav @mkdir -p $(OUTPUT_DIR) jaby_engine_fconv $< -o $@ xa +$(OUTPUT_DIR)/Evacuation.xa: audio/Evacuation_cdda.wav + @mkdir -p $(OUTPUT_DIR) + jaby_engine_fconv $< -o $@ xa + # TODO: Simplyfy all of these? $(OUTPUT_DIR)/TexturePage.bin: TexturePage.png @mkdir -p $(OUTPUT_DIR) diff --git a/examples/PoolBox/iso/Config.xml b/examples/PoolBox/iso/Config.xml index 25600aef..09e899a4 100644 --- a/examples/PoolBox/iso/Config.xml +++ b/examples/PoolBox/iso/Config.xml @@ -34,8 +34,8 @@ - ../assets/audio/Evacuation_cdda.wav \ No newline at end of file