mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Wii) Ability to use custom libogc library

Browse Source
This commit is contained in:
twinaphex 2013-04-28 18:37:55 +02:00
parent 3b5c85f485
commit ebda8425dc
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.wii
View File

@ -6,6 +6,7 @@ HAVE_FILE_LOGGER = 0
PERF_TEST = 0 PERF_TEST = 0
WHOLE_ARCHIVE_LINK = 0 WHOLE_ARCHIVE_LINK = 0
BIG_STACK = 0 BIG_STACK = 0
CUSTOM_LIBOGC = 0
PC_DEVELOPMENT_IP_ADDRESS = "192.168.1.6" PC_DEVELOPMENT_IP_ADDRESS = "192.168.1.6"
PC_DEVELOPMENT_UDP_PORT = 3490 PC_DEVELOPMENT_UDP_PORT = 3490
@ -34,6 +35,13 @@ ELF_TARGET := retroarch_wii.elf
INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/ogc INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/ogc
LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L. LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
ifeq ($(CUSTOM_LIBOGC), 1)
LIBOGC_LIB := -lminiogc
CFLAGS += -DHAVE_MINIOGC
else
LIBOGC_LIB := -logc
endif
MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE) CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
ifeq ($(WHOLE_ARCHIVE_LINK), 1) ifeq ($(WHOLE_ARCHIVE_LINK), 1)
@ -44,7 +52,7 @@ LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map,-wrap,malloc,-wrap,fr
ifeq ($(BIG_STACK), 1) ifeq ($(BIG_STACK), 1)
LDFLAGS += -T gx/ld/rvl.ld LDFLAGS += -T gx/ld/rvl.ld
endif endif
LIBS := -lfat $(WHOLE_START) -lretro_wii $(WHOLE_END) -logc $(LDFLAGS_WIIUSE) -lbte LIBS := -lfat $(WHOLE_START) -lretro_wii $(WHOLE_END) $(LIBOGC_LIB) $(LDFLAGS_WIIUSE) -lbte
APP_BOOTER_DIR = wii/app_booter APP_BOOTER_DIR = wii/app_booter
OBJ = griffin/griffin.o $(APP_BOOTER_DIR)/app_booter.binobj OBJ = griffin/griffin.o $(APP_BOOTER_DIR)/app_booter.binobj

2
frontend/menu/rgui.c
View File

@ -1924,8 +1924,10 @@ static bool directory_parse(rgui_handle_t *rgui, const char *directory, unsigned
rgui_list_push(ctx, "sd:/", menu_type, 0); rgui_list_push(ctx, "sd:/", menu_type, 0);
rgui_list_push(ctx, "usb:/", menu_type, 0); rgui_list_push(ctx, "usb:/", menu_type, 0);
#endif #endif
#if !(defined(HAVE_MINIOGC) && defined(HW_RVL))
rgui_list_push(ctx, "carda:/", menu_type, 0); rgui_list_push(ctx, "carda:/", menu_type, 0);
rgui_list_push(ctx, "cardb:/", menu_type, 0); rgui_list_push(ctx, "cardb:/", menu_type, 0);
#endif
#elif defined(_XBOX1) #elif defined(_XBOX1)
rgui_list_push(ctx, "C:\\", menu_type, 0); rgui_list_push(ctx, "C:\\", menu_type, 0);
rgui_list_push(ctx, "D:\\", menu_type, 0); rgui_list_push(ctx, "D:\\", menu_type, 0);