diff options
| author | XaviDCR92 <xavi.dcr@gmail.com> | 2018-03-17 01:43:53 +0100 |
|---|---|---|
| committer | XaviDCR92 <xavi.dcr@gmail.com> | 2018-03-17 01:43:53 +0100 |
| commit | 51d4c1ea89c7de9841d37505f9b780de70c696f2 (patch) | |
| tree | 0b49df5082a68fef97903eb7b7d6b4921277a6cd /Source/Makefile | |
| parent | be36d09ae70587f2ccb73906e895914421f336ff (diff) | |
| download | airport-51d4c1ea89c7de9841d37505f9b780de70c696f2.tar.gz | |
* System.c: Root counters are finally working, YAY!
* Sfx.c: SfxStopMusic() was relying on global timer to be increased under ISR, but this is not true anymore!
* Other minor changes on EndAnimation.c.
Diffstat (limited to 'Source/Makefile')
| -rw-r--r-- | Source/Makefile | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/Source/Makefile b/Source/Makefile index 9eeb9d0..f410b4b 100644 --- a/Source/Makefile +++ b/Source/Makefile @@ -12,8 +12,8 @@ GNU_SIZE = mipsel-unknown-elf-size # Custom define flags for GCC DEFINE= -DFIXMATH_FAST_SIN -D_PAL_MODE_ DEFINE += -DPSXSDK_DEBUG -DEFINE += -DNO_CDDA -DEFINE += -DNO_INTRO +#DEFINE += -DNO_CDDA +#DEFINE += -DNO_INTRO # Compiler flags LIBS= -lfixmath @@ -56,9 +56,11 @@ OBJECTS = $(addprefix $(OBJ_DIR)/, main.o System.o Menu.o Gfx.o Pad.o MainMenuBt DEPS = $(OBJECTS:.o=.d) # CD-DA objects: -MUSIC_TRACKS = --track=../Bin/TRACK01.bin --track=../Bin/TRACK02.bin --track=../Bin/TRACK03.bin +MUSIC_OBJ_DIR = ../Bin +MUSIC_SRC_DIR = ../Music +MUSIC_TRACKS = $(addprefix $(MUSIC_OBJ_DIR)/, TRACK01.bin TRACK02.bin TRACK03.bin) FFMPEG = ffmpeg -FFMPEG_DIR = ../Music/ffmpeg/bin +FFMPEG_DIR = $(MUSIC_SRC_DIR)/$(FFMPEG)/bin FFMPEG_FLAGS = -f s16le -acodec pcm_s16le # VAG objects: @@ -110,12 +112,13 @@ SPRITE_OBJECTS = $(addprefix $(OBJ_SPRITES_PATH)/, PSXDISK.TIM \ SPRITE_OBJECTS += $(addprefix $(OBJ_FONTS_PATH)/, INTROFNT.TIM \ FONT_1.TIM \ FONT_2.TIM ) +# ------------------------------------ # Instructions # ------------------------------------ -$(BIN_TARGET_PATH)/$(PROJECT).bin: $(EXE_PATH)/$(PROJECT).iso -#~ mkpsxiso $< $@ $(LICENSE_FILE) $(MUSIC_TRACKS) - mkpsxiso $< $@ $(LICENSE_FILE) +$(BIN_TARGET_PATH)/$(PROJECT).bin: $(EXE_PATH)/$(PROJECT).iso $(MUSIC_TRACKS) + mkpsxiso $< $@ $(LICENSE_FILE) $(addprefix --track=, $(MUSIC_TRACKS)) +#~ mkpsxiso $< $@ $(LICENSE_FILE) # $(PROJECT).cue is automatically generated by mkpsxiso rebuild: @@ -124,8 +127,6 @@ rebuild: -include $(DEPS) -music_objects: $(addprefix ../Music/, TRACK01.bin TRACK02.bin TRACK03.bin) - clean: rm -f $(OBJ_DIR)/*.o rm -f $(OBJ_SOUNDS_DIR)/*.VAG @@ -173,12 +174,10 @@ $(OBJ_LEVELS_DIR)/%.LVL: $(SRC_LEVELS_DIR)/%.LVL $(OBJ_LEVELS_DIR)/%.PLT: $(SRC_LEVELS_DIR)/%.PLT cp $^ $@ -music: clean_music music_objects +music: music_objects -%.bin: %.mp3 - rm -f ../Bin/$@1 - $(FFMPEG) -i $< $(FFMPEG_FLAGS) $@ - cp ../Music/$@ ../Bin/ +$(MUSIC_OBJ_DIR)/%.bin: $(MUSIC_SRC_DIR)/%.mp3 + $(FFMPEG_DIR)/$(FFMPEG) -i $< $(FFMPEG_FLAGS) $@ # ---------------------------------------- # Phony targets |