From 325f903186bd78ca1c5bda3324075efdb5cdd141 Mon Sep 17 00:00:00 2001 From: Stefanos Kornilios Mitsis Poiitidis Date: Wed, 26 Mar 2025 07:24:47 +0000 Subject: [PATCH] Revert "Merge branch 'skmp/fix-makefile-cases' into 'main'" This reverts merge request !75 --- liberty/Makefile | 8 ++++---- miami/Makefile | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/liberty/Makefile b/liberty/Makefile index ed5eeb17..010728ba 100644 --- a/liberty/Makefile +++ b/liberty/Makefile @@ -605,20 +605,20 @@ $(REPACK_SFX_DC_DIR)/%.pcm: $(REPACK_SFX_ORIG_DIR)/%.wav aud2adpcm # stream processing # first try the mods loose directory -$(REPACK_STREAM_DEST_DIR)/%.APM: $(GTA_MOD_LOOSE_DIR)/[Aa]udio/%.wav aud2adpcm +$(REPACK_STREAM_DEST_DIR)/%.APM: $(GTA_MOD_LOOSE_DIR)/audio/%.wav aud2adpcm @mkdir -p $(@D) ./aud2adpcm $(AUDIO_STREAM_OPTION) $< $@ -$(REPACK_STREAM_DEST_DIR)/%.APM: $(GTA_MOD_LOOSE_DIR)/[Aa]udio/%.mp3 aud2adpcm +$(REPACK_STREAM_DEST_DIR)/%.APM: $(GTA_MOD_LOOSE_DIR)/audio/%.mp3 aud2adpcm @mkdir -p $(@D) ./aud2adpcm $(AUDIO_STREAM_OPTION) $< $@ # then original folder -$(REPACK_STREAM_DEST_DIR)/%.APM: $(GTA_DIR)/[Aa]udio/%.wav aud2adpcm +$(REPACK_STREAM_DEST_DIR)/%.APM: $(GTA_DIR)/audio/%.wav aud2adpcm @mkdir -p $(@D) ./aud2adpcm $(AUDIO_STREAM_OPTION) $< $@ -$(REPACK_STREAM_DEST_DIR)/%.APM: $(GTA_DIR)/[Aa]udio/%.mp3 aud2adpcm +$(REPACK_STREAM_DEST_DIR)/%.APM: $(GTA_DIR)/audio/%.mp3 aud2adpcm @mkdir -p $(@D) ./aud2adpcm $(AUDIO_STREAM_OPTION) $< $@ diff --git a/miami/Makefile b/miami/Makefile index ce9f4afb..da7af878 100644 --- a/miami/Makefile +++ b/miami/Makefile @@ -611,15 +611,15 @@ $(REPACK_SFX_DC_DIR)/%.pcm: $(REPACK_SFX_ORIG_DIR)/%.wav aud2adpcm # stream processing # first try the mods loose directory -$(REPACK_STREAM_DEST_DIR)/%.APM: $(GTA_MOD_LOOSE_DIR)/[Aa]udio/%.wav aud2adpcm +$(REPACK_STREAM_DEST_DIR)/%.APM: $(GTA_MOD_LOOSE_DIR)/Audio/%.wav aud2adpcm @mkdir -p $(@D) ./aud2adpcm $(AUDIO_STREAM_OPTION) $< $@ -$(REPACK_STREAM_DECODED_DIR)/%.mp3: $(GTA_MOD_LOOSE_DIR)/[Aa]udio/%.adf adf2mp3 +$(REPACK_STREAM_DECODED_DIR)/%.mp3: $(GTA_MOD_LOOSE_DIR)/Audio/%.adf adf2mp3 @mkdir -p $(@D) ./adf2mp3 $< $@ -$(REPACK_STREAM_DEST_DIR)/%.APM: $(GTA_MOD_LOOSE_DIR)/[Aa]udio/%.mp3 aud2adpcm +$(REPACK_STREAM_DEST_DIR)/%.APM: $(GTA_MOD_LOOSE_DIR)/Audio/%.mp3 aud2adpcm @mkdir -p $(@D) ./aud2adpcm $(AUDIO_STREAM_OPTION) $< $@ @@ -628,15 +628,15 @@ $(REPACK_STREAM_DEST_DIR)/%.APM: $(REPACK_STREAM_DECODED_DIR)/%.mp3 aud2adpcm ./aud2adpcm $(AUDIO_STREAM_OPTION) $< $@ # then original folder -$(REPACK_STREAM_DEST_DIR)/%.APM: $(GTA_DIR)/[Aa]udio/%.wav aud2adpcm +$(REPACK_STREAM_DEST_DIR)/%.APM: $(GTA_DIR)/Audio/%.wav aud2adpcm @mkdir -p $(@D) ./aud2adpcm $(AUDIO_STREAM_OPTION) $< $@ -$(REPACK_STREAM_DECODED_DIR)/%.mp3: $(GTA_DIR)/[Aa]udio/%.adf adf2mp3 +$(REPACK_STREAM_DECODED_DIR)/%.mp3: $(GTA_DIR)/Audio/%.adf adf2mp3 @mkdir -p $(@D) ./adf2mp3 $< $@ -$(REPACK_STREAM_DEST_DIR)/%.APM: $(GTA_DIR)/[Aa]udio/%.mp3 aud2adpcm +$(REPACK_STREAM_DEST_DIR)/%.APM: $(GTA_DIR)/Audio/%.mp3 aud2adpcm @mkdir -p $(@D) ./aud2adpcm $(AUDIO_STREAM_OPTION) $< $@