From 2ccc0f5edd5f8e61bd0760f30b2d66f2d977b2bf Mon Sep 17 00:00:00 2001 From: Xavier ASUS Date: Sun, 18 Nov 2018 20:03:35 +0100 Subject: Added "const" qualifier to some functions. "cdrom:\ and ;1" are automatically inserted into file name, in order to save memory space. Some minor optimizations. --- Source/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Source/Makefile') diff --git a/Source/Makefile b/Source/Makefile index e060db1..865d17d 100644 --- a/Source/Makefile +++ b/Source/Makefile @@ -60,7 +60,8 @@ 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_SRC_DIR)/$(FFMPEG)/bin +FFMPEG_DIR = +#FFMPEG_DIR = $(MUSIC_SRC_DIR)/$(FFMPEG)/bin/ FFMPEG_FLAGS = -f s16le -acodec pcm_s16le # VAG objects: @@ -117,7 +118,7 @@ SPRITE_OBJECTS += $(addprefix $(OBJ_FONTS_PATH)/, INTROFNT.TIM \ # ------------------------------------ $(BIN_TARGET_PATH)/$(PROJECT).bin: $(EXE_PATH)/$(PROJECT).iso $(MUSIC_TRACKS) - mkpsxiso $< $@ $(LICENSE_FILE) $(addprefix --track=, $(MUSIC_TRACKS)) + mkpsxiso $< $@ $(LICENSE_FILE) -s $(addprefix --track=, $(MUSIC_TRACKS)) #~ mkpsxiso $< $@ $(LICENSE_FILE) # $(PROJECT).cue is automatically generated by mkpsxiso @@ -128,6 +129,7 @@ rebuild: -include $(DEPS) clean: + rm -f $(OBJ_DIR)/*.d rm -f $(OBJ_DIR)/*.o rm -f $(OBJ_SOUNDS_DIR)/*.VAG rm -f $(OBJ_LEVELS_DIR)/*.LVL @@ -175,7 +177,7 @@ $(OBJ_LEVELS_DIR)/%.PLT: $(SRC_LEVELS_DIR)/%.PLT cp $^ $@ $(MUSIC_OBJ_DIR)/%.bin: $(MUSIC_SRC_DIR)/%.mp3 - $(FFMPEG_DIR)/$(FFMPEG) -i $< $(FFMPEG_FLAGS) $@ + $(FFMPEG_DIR)$(FFMPEG) -i $< $(FFMPEG_FLAGS) $@ # ---------------------------------------- # Phony targets -- cgit v1.2.3