mirror of
https://github.com/libretro/RetroArch
synced 2025-03-14 01:19:01 +00:00
(NGC) Links and builds again
This commit is contained in:
parent
16b2358bf6
commit
cee5dfc1de
@ -35,11 +35,11 @@ LIBDIRS := -L$(DEVKITPRO)/libogc/lib/cube -L.
|
||||
MACHDEP := -DGEKKO -DHW_DOL -mogc -mcpu=750 -meabi -mhard-float
|
||||
CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
|
||||
LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map -T gx/ld/ogc.ld
|
||||
LIBS := -lfat -logc
|
||||
LIBS := -lfat -lretro_ngc -logc
|
||||
|
||||
APP_BOOTER_DIR = gx/app_booter
|
||||
|
||||
OBJ = console/griffin/griffin.o console/font.binobj console/rzlib/rzlib.o $(APP_BOOTER_DIR)/app_booter_gc.binobj
|
||||
OBJ = console/griffin/griffin.o console/font.binobj console/rzlib/rzlib.o $(APP_BOOTER_DIR)/app_booter_ngc.binobj
|
||||
|
||||
ifeq ($(HAVE_LOGGER), 1)
|
||||
CFLAGS += -DHAVE_LOGGER
|
||||
@ -79,7 +79,7 @@ $(ELF_TARGET): $(OBJ)
|
||||
%.binobj: %.bin
|
||||
$(LD) -r -b binary -o $@ $<
|
||||
|
||||
$(APP_BOOTER_DIR)/app_booter_gc.bin:
|
||||
$(APP_BOOTER_DIR)/app_booter_ngc.bin:
|
||||
$(MAKE) -C $(APP_BOOTER_DIR) platform=ngc
|
||||
|
||||
pkg: all
|
||||
|
@ -26,8 +26,8 @@ CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
|
||||
LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
|
||||
ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
|
||||
|
||||
DOL_TARGET := retroarch-salamander_gx_gc.dol
|
||||
ELF_TARGET := retroarch-salamander_gx_gc.elf
|
||||
DOL_TARGET := retroarch-salamander_ngc.dol
|
||||
ELF_TARGET := retroarch-salamander_ngc.elf
|
||||
|
||||
INCLUDE := -I. -I$(DEVKITPRO)/libogc/include
|
||||
LIBDIRS := -L$(DEVKITPRO)/libogc/lib/cube -L.
|
||||
@ -35,11 +35,11 @@ LIBDIRS := -L$(DEVKITPRO)/libogc/lib/cube -L.
|
||||
MACHDEP := -DGEKKO -DHW_DOL -mogc -mcpu=750 -meabi -mhard-float
|
||||
CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
|
||||
LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
|
||||
LIBS := -lfat -lretro_ngc -logc
|
||||
LIBS := -lfat -logc
|
||||
|
||||
APP_BOOTER_DIR = gx/app_booter
|
||||
|
||||
OBJ = gx/salamander/main.o console/rarch_console_exec.o console/rarch_console_libretro_mgmt.o file_path.o compat/compat.o conf/config_file.o $(APP_BOOTER_DIR)/app_booter_gc.binobj
|
||||
OBJ = gx/salamander/main.o console/rarch_console_exec.o console/rarch_console_libretro_mgmt.o file_path.o compat/compat.o conf/config_file.o $(APP_BOOTER_DIR)/app_booter_ngc.binobj
|
||||
|
||||
ifeq ($(HAVE_LOGGER), 1)
|
||||
CFLAGS += -DHAVE_LOGGER
|
||||
@ -76,8 +76,8 @@ $(ELF_TARGET): $(OBJ)
|
||||
%.binobj: %.bin
|
||||
$(LD) -r -b binary -o $@ $<
|
||||
|
||||
$(APP_BOOTER_DIR)/app_booter_gc.bin:
|
||||
$(MAKE) -C $(APP_BOOTER_DIR) platform=gc
|
||||
$(APP_BOOTER_DIR)/app_booter_ngc.bin:
|
||||
$(MAKE) -C $(APP_BOOTER_DIR) platform=ngc
|
||||
|
||||
pkg: all
|
||||
cp -r $(DOL_TARGET) gx/pkg/boot.dol
|
||||
@ -86,7 +86,7 @@ clean:
|
||||
rm -f $(DOL_TARGET)
|
||||
rm -f $(ELF_TARGET)
|
||||
rm -f $(OBJ)
|
||||
$(MAKE) -C $(APP_BOOTER_DIR) platform=gc clean
|
||||
$(MAKE) -C $(APP_BOOTER_DIR) platform=ngc clean
|
||||
|
||||
.PHONY: clean
|
||||
|
||||
|
@ -64,10 +64,10 @@ extern uint8_t _binary_gx_app_booter_app_booter_wii_bin_end[];
|
||||
#define BOOTER_ADDR ((uint8_t *) 0x81300000)
|
||||
extern void __exception_closeall(void);
|
||||
|
||||
extern uint8_t _binary_gx_app_booter_app_booter_gc_bin_start[];
|
||||
extern uint8_t _binary_gx_app_booter_app_booter_gc_bin_end[];
|
||||
#define booter_start _binary_gx_app_booter_app_booter_gc_bin_start
|
||||
#define booter_end _binary_gx_app_booter_app_booter_gc_bin_end
|
||||
extern uint8_t _binary_gx_app_booter_app_booter_ngc_bin_start[];
|
||||
extern uint8_t _binary_gx_app_booter_app_booter_ngc_bin_end[];
|
||||
#define booter_start _binary_gx_app_booter_app_booter_ngc_bin_start
|
||||
#define booter_end _binary_gx_app_booter_app_booter_ngc_bin_end
|
||||
|
||||
#endif
|
||||
|
||||
|
@ -22,8 +22,8 @@ ifeq ($(platform),wii)
|
||||
BIN_TARGET := app_booter_wii.bin
|
||||
ELF_TARGET := app_booter_wii.elf
|
||||
else
|
||||
BIN_TARGET := app_booter_gc.bin
|
||||
ELF_TARGET := app_booter_gc.elf
|
||||
BIN_TARGET := app_booter_ngc.bin
|
||||
ELF_TARGET := app_booter_ngc.elf
|
||||
endif
|
||||
|
||||
INCLUDE := -I. -I$(DEVKITPRO)/libogc/include
|
||||
|
@ -29,7 +29,9 @@
|
||||
#include "../../console/rarch_console_main_wrap.h"
|
||||
#include "../../console/rarch_console_settings.h"
|
||||
|
||||
#include "../mem2_manager.h"
|
||||
#ifdef HW_RVL
|
||||
#include "../wii/mem2_manager.h"
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stddef.h>
|
||||
|
@ -20,7 +20,11 @@
|
||||
#include "../console/rarch_console_video.h"
|
||||
#include "../console/font.h"
|
||||
#include "../gfx/gfx_common.h"
|
||||
#include "mem2_manager.h"
|
||||
|
||||
#ifdef HW_RVL
|
||||
#include "../wii/mem2_manager.h"
|
||||
#endif
|
||||
|
||||
#include "gx_video.h"
|
||||
#include <gccore.h>
|
||||
#include <ogcsys.h>
|
||||
|
Loading…
x
Reference in New Issue
Block a user