From 7ba159f6e7278b494ec98e527b5bb8a282864cf0 Mon Sep 17 00:00:00 2001 From: XaviDCR92 Date: Fri, 15 Sep 2017 23:04:25 +0200 Subject: * Corrected dependencies for Makefile (.elf was being rebuilt every time, as well as .bin/.cue). * Removed useless macro MAIN_MENU_FILES. --- Source/Menu.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Source/Menu.c') diff --git a/Source/Menu.c b/Source/Menu.c index e764cf3..c3a2f13 100644 --- a/Source/Menu.c +++ b/Source/Menu.c @@ -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 , -- cgit v1.2.3