* Corrected dependencies for Makefile (.elf was being rebuilt every time, as well as .bin/.cue).

* Removed useless macro MAIN_MENU_FILES.
This commit is contained in:
XaviDCR92 2017-09-15 23:04:25 +02:00
parent 69027a04e3
commit 7ba159f6e7
5 changed files with 109 additions and 105 deletions

View File

@ -7,25 +7,25 @@
14:55
#Aircraft arrival (or departure) must be set relative to initial time, in HH:MM format.
ARRIVAL;PHX1802;100;00:10;0;360
#ARRIVAL;PHX2015;100;00:10;0;360
#ARRIVAL;PHX2016;100;00:40;0;360
#ARRIVAL;PHX2017;100;00:50;0;360
#ARRIVAL;PHX2018;100;01:40;0;360
#ARRIVAL;PHX2019;100;01:20;0;360
#ARRIVAL;PHX2020;100;02:00;0;360
#ARRIVAL;PHX2021;100;00:05;0;360
#ARRIVAL;PHX2022;100;00:15;0;360
#ARRIVAL;PHX2023;100;00:45;0;360
#ARRIVAL;PHX2024;100;01:45;0;360
#ARRIVAL;PHX2025;100;01:20;0;360
#ARRIVAL;PHX2026;100;01:10;0;360
#DEPARTURE;PHX1000;100;00:05;19;180
#DEPARTURE;PHX1001;100;00:15;19;180
#DEPARTURE;PHX1002;100;00:30;19;180
#DEPARTURE;PHX1003;100;00:45;19;180
#DEPARTURE;PHX1004;100;01:10;19;180
#DEPARTURE;PHX1280;100;01:30;19;180
#DEPARTURE;PHX1332;100;00:50;21;180
#DEPARTURE;PHX1333;100;01:00;19;180
#DEPARTURE;PHX1334;100;01:15;21;180
#DEPARTURE;PHX1336;100;01:20;21;180
ARRIVAL;PHX2015;100;00:10;0;360
ARRIVAL;PHX2016;100;00:40;0;360
ARRIVAL;PHX2017;100;00:50;0;360
ARRIVAL;PHX2018;100;01:40;0;360
ARRIVAL;PHX2019;100;01:20;0;360
ARRIVAL;PHX2020;100;02:00;0;360
ARRIVAL;PHX2021;100;00:05;0;360
ARRIVAL;PHX2022;100;00:15;0;360
ARRIVAL;PHX2023;100;00:45;0;360
ARRIVAL;PHX2024;100;01:45;0;360
ARRIVAL;PHX2025;100;01:20;0;360
ARRIVAL;PHX2026;100;01:10;0;360
DEPARTURE;PHX1000;100;00:05;19;180
DEPARTURE;PHX1001;100;00:15;19;180
DEPARTURE;PHX1002;100;00:30;19;180
DEPARTURE;PHX1003;100;00:45;19;180
DEPARTURE;PHX1004;100;01:10;19;180
DEPARTURE;PHX1280;100;01:30;19;180
DEPARTURE;PHX1332;100;00:50;21;180
DEPARTURE;PHX1333;100;01:00;19;180
DEPARTURE;PHX1334;100;01:15;21;180
DEPARTURE;PHX1336;100;01:20;21;180

Binary file not shown.

View File

@ -1,6 +1,9 @@
# Project-wise definitions
PROJECT = AIRPORT
# Make flags
MAKEFLAGS := -j$(NUMBER_OF_PROCESSORS)
# GNU Toolchain definitions
CC = psx-gcc
LINKER = psx-gcc
@ -20,6 +23,8 @@ CC_FLAGS = -Wall -Werror -c -Os -Wfatal-errors -g
PSXSDK_PATH = /usr/local/psxsdk
PATH := $(PATH):$(PSXSDK_PATH)/bin/
PROJECT_DIR = ~/$(PROJECT)
CDROM_ROOT=$(PROJECT_DIR)/cdimg
BIN_TARGET_PATH = $(PROJECT_DIR)/Bin
#Uncomment this DEFINE below to use Airport together with OpenSend + QPSXSerial toolchain.
#DEFINE += -DSERIAL_INTERFACE
@ -29,6 +34,7 @@ PROJECT_DIR = ~/$(PROJECT)
ELF2EXE = elf2exe
ELF2EXE_FLAGS = -mark="A homebrew game created with PSXSDK"
LICENSE_FILE = /usr/local/psxsdk/share/licenses/infoeur.dat
EXE_PATH = Exe
# PCSX-R
EMULATOR_DIR = ~/pcsxr
@ -67,13 +73,20 @@ SOUND_OBJECTS = $(addprefix $(SOUNDS_FOLDER)/, BELL.VAG \
RCTM1F1.VAG \
RCPW1A1.VAG \
RCPM1A1.VAG )
# Level objects:
SRC_LEVELS_DIR = $(PROJECT_DIR)/Levels
OBJ_LEVELS_DIR = $(CDROM_ROOT)/DATA/LEVELS
LEVEL_OBJECTS = $(addprefix $(OBJ_LEVELS_DIR)/, LEVEL1.LVL LEVEL1.PLT)
# ------------------------------------
# Instructions
# ------------------------------------
build: sounds levels $(PROJECT).bin
build: $(BIN_TARGET_PATH)/$(PROJECT).bin
rebuild: clean build
rebuild:
make clean
make build
-include $(DEPS)
@ -81,76 +94,63 @@ music_objects: $(addprefix ../Music/, TRACK01.bin TRACK02.bin TRACK03.bin)
clean:
rm -f Obj/*.o
rm -f ../cdimg/DATA/SOUNDS/*.VAG
rm -f $(CDROM_ROOT)/DATA/SOUNDS/*.VAG
rm -f $(CDROM_ROOT)/DATA/LEVELS/*.LVL
rm -f $(CDROM_ROOT)/DATA/LEVELS/*.PLT
$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c $(OBJ_DIR)/%.d
$(CC) $< -o $@ $(DEFINE) $(CC_FLAGS) -MMD
$(PROJECT).elf: $(OBJECTS)
$(LINKER) Obj/*.o -o Exe/$(PROJECT).elf $(LIBS) -Wl,--gc-sections
$(EXE_PATH)/$(PROJECT).elf: $(OBJECTS)
$(LINKER) $^ -o $@ $(LIBS) -Wl,--gc-sections
$(PROJECT).iso: $(PROJECT).exe
# rm -f $@
mkisofs -o $(PROJECT).iso -V $(PROJECT) -sysid PLAYSTATION ../cdimg
$(EXE_PATH)/$(PROJECT).iso: $(EXE_PATH)/$(PROJECT).exe $(SOUND_OBJECTS) $(LEVEL_OBJECTS)
mkisofs -o $@ -V $(PROJECT) -sysid PLAYSTATION $(CDROM_ROOT)
$(PROJECT).bin: $(PROJECT).iso
rm -f $@
rm -f $(PROJECT).cue
mkpsxiso $(PROJECT).iso $(PROJECT).bin $(LICENSE_FILE) $(MUSIC_TRACKS)
$(BIN_TARGET_PATH)/$(PROJECT).bin: $(EXE_PATH)/$(PROJECT).iso
mkpsxiso $< $@ $(LICENSE_FILE) $(MUSIC_TRACKS)
# $(PROJECT).cue is automatically generated by mkpsxiso
rm -f $^
mv $@ ../Bin
mv $(PROJECT).cue ../Bin
$(GNU_SIZE) Exe/$(PROJECT).elf
$(PROJECT).exe: $(PROJECT).elf
$(ELF2EXE) Exe/$(PROJECT).elf Exe/$(PROJECT).exe $(ELF2EXE_FLAGS)
cp Exe/$(PROJECT).exe ../cdimg
$(EXE_PATH)/$(PROJECT).exe: $(EXE_PATH)/$(PROJECT).elf
$(ELF2EXE) $< $@ $(ELF2EXE_FLAGS)
cp $@ $(CDROM_ROOT)
emulator:
export PATH=$$PATH:$(EMULATOR_DIR)
$(EMULATOR) -cdfile $(PROJECT_DIR)/Bin/$(PROJECT).bin $(EMULATOR_FLAGS)
remove_elf_iso:
rm -f $(PROJECT).elf cdimg/$(PROJECT).exe $(PROJECT).bin $(PROJECT).cue cdimg/README.txt
rm -f $(PROJECT).iso $(PROJECT).exe $(PROJECT).elf
#~ emulator:
#~ export PATH=$$PATH:$(EMULATOR_DIR)
#~ $(EMULATOR) -cdfile $(PROJECT_DIR)/Bin/$(PROJECT).bin $(EMULATOR_FLAGS)
tiles:
rm -f ../cdimg/DATA/SPRITES/*.TIM
rm -f ../cdimg/DATA/FONTS/*.FNT
bmp2tim ../Sprites/PSXDisk.bmp ../cdimg/DATA/SPRITES/PSXDISK.TIM 16 -org=384,0 -mpink
bmp2tim ../Sprites/IntroFnt.bmp ../cdimg/DATA/SPRITES/INTROFNT.TIM 16 -org=384,76 -mpink
bmp2tim ../Sprites/Tileset1.bmp ../cdimg/DATA/SPRITES/TILESET1.TIM 16 -org=384,0 -mpink
bmp2tim ../Sprites/Tileset2.bmp ../cdimg/DATA/SPRITES/TILESET2.TIM 16 -org=640,0 -mpink
bmp2tim ../Sprites/MainMenu.bmp ../cdimg/DATA/SPRITES/MAINMENU.TIM 16 -org=768,384 -mpink
bmp2tim ../Sprites/Loading.bmp ../cdimg/DATA/SPRITES/LOADING.TIM 4 -mpink -org=768,256 -clut=384,496
bmp2tim ../Sprites/Plane.bmp ../cdimg/DATA/SPRITES/PLANE.TIM 16 -org=536,240 -mpink
bmp2tim ../Sprites/Buttons.bmp ../cdimg/DATA/SPRITES/BUTTONS.TIM 16 -org=384,240 -mpink
bmp2tim ../Sprites/GamePln.bmp ../cdimg/DATA/SPRITES/GAMEPLN.TIM 8 -mpink -org=800,256 -clut=384,497
bmp2tim ../Sprites/GamePln_Blue.bmp ../cdimg/DATA/SPRITES/PLNBLUE.CLT 8 -mpink -clut=384,501
bmp2tim ../Sprites/Bubble.bmp ../cdimg/DATA/SPRITES/BUBBLE.TIM 8 -org=584,240 -mpink -clut=384,498
bmp2tim ../Sprites/Font_1_4bit.bmp ../cdimg/DATA/FONTS/FONT_1.FNT 4 -org=960,256 -mpink -clut=384,500
bmp2tim ../Sprites/Font_2_4bit.bmp ../cdimg/DATA/FONTS/FONT_2.FNT 4 -org=768,288 -mpink -clut=384,499
bmp2tim ../Sprites/GPL_4bit.bmp ../cdimg/DATA/SPRITES/GPL.TIM 4 -org=384,174 -mpink -clut=384,502
bmp2tim ../Sprites/OpSrc_8bit.bmp ../cdimg/DATA/SPRITES/OPENSRC.TIM 8 -org=464,0 -mpink -clut=384,503
bmp2tim ../Sprites/Mouse.bmp ../cdimg/DATA/SPRITES/MOUSE.TIM 16 -org=596,240 -mpink
bmp2tim ../Sprites/DepArr.bmp ../cdimg/DATA/SPRITES/DEPARR.TIM 16 -org=552,240 -mpink
bmp2tim ../Sprites/PageUpDn.bmp ../cdimg/DATA/SPRITES/PAGEUPDN.TIM 16 -org=504,240 -mpink
bmp2tim ../Sprites/Bldngs1.bmp ../cdimg/DATA/SPRITES/BLDNGS1.TIM 16 -org=640,128 -mpink
bmp2tim ../Sprites/Arrow.bmp ../cdimg/DATA/SPRITES/ARROW.TIM 16 -org=604,240 -mpink
bmp2tim ../Sprites/PSXDisk.bmp ../cdimg/DATA/SPRITES/PSXDISK.TIM 16 -org=384,0 -mpink
bmp2tim ../Sprites/IntroFnt.bmp ../cdimg/DATA/SPRITES/INTROFNT.TIM 16 -org=384,76 -mpink
bmp2tim ../Sprites/Tileset1.bmp ../cdimg/DATA/SPRITES/TILESET1.TIM 16 -org=384,0 -mpink
bmp2tim ../Sprites/Tileset2.bmp ../cdimg/DATA/SPRITES/TILESET2.TIM 16 -org=640,0 -mpink
bmp2tim ../Sprites/MainMenu.bmp ../cdimg/DATA/SPRITES/MAINMENU.TIM 16 -org=768,384 -mpink
bmp2tim ../Sprites/Loading.bmp ../cdimg/DATA/SPRITES/LOADING.TIM 4 -mpink -org=768,256 -clut=384,496
bmp2tim ../Sprites/Plane.bmp ../cdimg/DATA/SPRITES/PLANE.TIM 16 -org=536,240 -mpink
bmp2tim ../Sprites/Buttons.bmp ../cdimg/DATA/SPRITES/BUTTONS.TIM 16 -org=384,240 -mpink
bmp2tim ../Sprites/GamePln.bmp ../cdimg/DATA/SPRITES/GAMEPLN.TIM 8 -mpink -org=800,256 -clut=384,497
bmp2tim ../Sprites/GamePln_Blue.bmp ../cdimg/DATA/SPRITES/PLNBLUE.CLT 8 -mpink -clut=384,501
bmp2tim ../Sprites/Bubble.bmp ../cdimg/DATA/SPRITES/BUBBLE.TIM 8 -org=584,240 -mpink -clut=384,498
bmp2tim ../Sprites/Font_1_4bit.bmp ../cdimg/DATA/FONTS/FONT_1.FNT 4 -org=960,256 -mpink -clut=384,500
bmp2tim ../Sprites/Font_2_4bit.bmp ../cdimg/DATA/FONTS/FONT_2.FNT 4 -org=768,288 -mpink -clut=384,499
bmp2tim ../Sprites/GPL_4bit.bmp ../cdimg/DATA/SPRITES/GPL.TIM 4 -org=384,174 -mpink -clut=384,502
bmp2tim ../Sprites/OpSrc_8bit.bmp ../cdimg/DATA/SPRITES/OPENSRC.TIM 8 -org=464,0 -mpink -clut=384,503
bmp2tim ../Sprites/Mouse.bmp ../cdimg/DATA/SPRITES/MOUSE.TIM 16 -org=596,240 -mpink
bmp2tim ../Sprites/DepArr.bmp ../cdimg/DATA/SPRITES/DEPARR.TIM 16 -org=552,240 -mpink
bmp2tim ../Sprites/PageUpDn.bmp ../cdimg/DATA/SPRITES/PAGEUPDN.TIM 16 -org=504,240 -mpink
bmp2tim ../Sprites/Bldngs1.bmp ../cdimg/DATA/SPRITES/BLDNGS1.TIM 16 -org=640,128 -mpink
bmp2tim ../Sprites/Arrow.bmp ../cdimg/DATA/SPRITES/ARROW.TIM 16 -org=604,240 -mpink
bmp2tim ../Sprites/MenuStar_4_bit.bmp ../cdimg/DATA/SPRITES/MENUSTAR.TIM 4 -org=
$(SOUNDS_FOLDER)/%.VAG: $(SOURCE_SOUNDS_FOLDER)/%.wav
wav2vag $^ $@
sounds: $(SOUND_OBJECTS)
levels: LEVEL1.LVL LEVEL1.PLT
%.LVL:
cp ../Levels/$@ ../cdimg/DATA/LEVELS/
%.PLT:
cp ../Levels/$@ ../cdimg/DATA/LEVELS
$(OBJ_LEVELS_DIR)/%.LVL: $(SRC_LEVELS_DIR)/%.LVL
cp $^ $@
$(OBJ_LEVELS_DIR)/%.PLT: $(SRC_LEVELS_DIR)/%.PLT
cp $^ $@
music: clean_music music_objects
@ -161,3 +161,8 @@ clean_music:
rm -f ../Bin/$@1
$(FFMPEG) -i $< $(FFMPEG_FLAGS) $@
cp ../Music/$@ ../Bin/
# ----------------------------------------
# Phony targets
# ----------------------------------------
.PHONY: build sounds clean music levels tiles

View File

@ -20,7 +20,6 @@
* Defines *
* *************************************/
#define MAIN_MENU_FILES 1
#define BUTTON_SIZE 64
#define SELECTED_BUTTON_LUMINANCE 0xC0
@ -133,10 +132,10 @@ static TYPE_CHEAT SerialCheat;
static char* MainMenuFiles[] = { "cdrom:\\DATA\\SPRITES\\MAINMENU.TIM;1" ,
"cdrom:\\DATA\\SOUNDS\\BELL.VAG;1" ,
"cdrom:\\DATA\\SOUNDS\\ACCEPT.VAG;1" ,
"cdrom:\\DATA\\SPRITES\\PSXDISK.TIM;1" ,
"cdrom:\\DATA\\SPRITES\\INTROFNT.TIM;1" ,
"cdrom:\\DATA\\SPRITES\\BUTTONS.TIM;1" ,
#ifndef NO_INTRO
"cdrom:\\DATA\\SPRITES\\PSXDISK.TIM;1" ,
"cdrom:\\DATA\\SPRITES\\INTROFNT.TIM;1" ,
"cdrom:\\DATA\\SPRITES\\GPL.TIM;1" ,
"cdrom:\\DATA\\SPRITES\\OPENSRC.TIM;1" ,
"cdrom:\\DATA\\SOUNDS\\TRAYCL.VAG;1" ,
@ -144,13 +143,13 @@ static char* MainMenuFiles[] = { "cdrom:\\DATA\\SPRITES\\MAINMENU.TIM;1" ,
#endif // NO_INTRO
};
static void* MainMenuDest[] = { (GsSprite*)&MenuSpr ,
static void* MainMenuDest[] = { (GsSprite*)&MenuSpr ,
(SsVag*)&BellSnd ,
(SsVag*)&AcceptSnd ,
(GsSprite*)&PsxDisk ,
(GsSprite*)&PSXSDKIntroFont ,
(GsSprite*)&PSXButtons ,
#ifndef NO_INTRO
(GsSprite*)&PsxDisk ,
(GsSprite*)&PSXSDKIntroFont ,
(GsSprite*)&GPL_Logo ,
(GsSprite*)&OpenSource_Logo ,
(SsVag*)&TrayClSnd ,

View File

@ -7,25 +7,25 @@
14:55
#Aircraft arrival (or departure) must be set relative to initial time, in HH:MM format.
ARRIVAL;PHX1802;100;00:10;0;360
#ARRIVAL;PHX2015;100;00:10;0;360
#ARRIVAL;PHX2016;100;00:40;0;360
#ARRIVAL;PHX2017;100;00:50;0;360
#ARRIVAL;PHX2018;100;01:40;0;360
#ARRIVAL;PHX2019;100;01:20;0;360
#ARRIVAL;PHX2020;100;02:00;0;360
#ARRIVAL;PHX2021;100;00:05;0;360
#ARRIVAL;PHX2022;100;00:15;0;360
#ARRIVAL;PHX2023;100;00:45;0;360
#ARRIVAL;PHX2024;100;01:45;0;360
#ARRIVAL;PHX2025;100;01:20;0;360
#ARRIVAL;PHX2026;100;01:10;0;360
#DEPARTURE;PHX1000;100;00:05;19;180
#DEPARTURE;PHX1001;100;00:15;19;180
#DEPARTURE;PHX1002;100;00:30;19;180
#DEPARTURE;PHX1003;100;00:45;19;180
#DEPARTURE;PHX1004;100;01:10;19;180
#DEPARTURE;PHX1280;100;01:30;19;180
#DEPARTURE;PHX1332;100;00:50;21;180
#DEPARTURE;PHX1333;100;01:00;19;180
#DEPARTURE;PHX1334;100;01:15;21;180
#DEPARTURE;PHX1336;100;01:20;21;180
ARRIVAL;PHX2015;100;00:10;0;360
ARRIVAL;PHX2016;100;00:40;0;360
ARRIVAL;PHX2017;100;00:50;0;360
ARRIVAL;PHX2018;100;01:40;0;360
ARRIVAL;PHX2019;100;01:20;0;360
ARRIVAL;PHX2020;100;02:00;0;360
ARRIVAL;PHX2021;100;00:05;0;360
ARRIVAL;PHX2022;100;00:15;0;360
ARRIVAL;PHX2023;100;00:45;0;360
ARRIVAL;PHX2024;100;01:45;0;360
ARRIVAL;PHX2025;100;01:20;0;360
ARRIVAL;PHX2026;100;01:10;0;360
DEPARTURE;PHX1000;100;00:05;19;180
DEPARTURE;PHX1001;100;00:15;19;180
DEPARTURE;PHX1002;100;00:30;19;180
DEPARTURE;PHX1003;100;00:45;19;180
DEPARTURE;PHX1004;100;01:10;19;180
DEPARTURE;PHX1280;100;01:30;19;180
DEPARTURE;PHX1332;100;00:50;21;180
DEPARTURE;PHX1333;100;01:00;19;180
DEPARTURE;PHX1334;100;01:15;21;180
DEPARTURE;PHX1336;100;01:20;21;180