From 8603717768af2d6220ad9f34b5173415fef7ee90 Mon Sep 17 00:00:00 2001 From: Mitchell Rysavy Date: Sun, 29 Jun 2025 07:55:39 -0400 Subject: [PATCH 1/2] Use pkg-config for freetype cflags and libs --- Makefile.gc | 6 ++++-- Makefile.wii | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile.gc b/Makefile.gc index b88f6a92..489989d3 100644 --- a/Makefile.gc +++ b/Makefile.gc @@ -10,6 +10,8 @@ endif include $(DEVKITPPC)/gamecube_rules export LIBOGC_INC := $(DEVKITPRO)/libogc2/include export LIBOGC_LIB := $(DEVKITPRO)/libogc2/lib/cube +export FREETYPE_CFLAGS := `$(DEVKITPRO)/portlibs/ppc/bin/powerpc-eabi-pkg-config --cflags freetype2` +export FREETYPE_LIBS := `$(DEVKITPRO)/portlibs/ppc/bin/powerpc-eabi-pkg-config --libs freetype2` #--------------------------------------------------------------------------------- # TARGET is the name of the output @@ -30,7 +32,7 @@ INCLUDES := source #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- -SHAREDFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) `freetype-config --cflags` \ +SHAREDFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) $(FREETYPE_CFLAGS) \ -DFRAMESKIP -DPSS_STYLE=1 -DPATH_MAX=1024 -DHAVE_ASPRINTF \ -D_SZ_ONE_DIRECTORY -D_LZMA_IN_CB -D_LZMA_OUT_READ -DNOUNCRYPT -DNO_SOUND -DUSE_VM \ -fomit-frame-pointer \ @@ -46,7 +48,7 @@ LDFLAGS += -L../buildtools #--------------------------------------------------------------------------------- # any extra libraries we wish to link with the project #--------------------------------------------------------------------------------- -LIBS := -lpng -lmxml -ltinysmb -lbba -lfat -liso9660 -lasnd -lz -logc `freetype-config --libs` +LIBS := -lpng -lmxml -ltinysmb -lbba -lfat -liso9660 -lasnd -lz -logc $(FREETYPE_LIBS) #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing diff --git a/Makefile.wii b/Makefile.wii index 1a689585..c5723953 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -10,6 +10,8 @@ endif include $(DEVKITPPC)/wii_rules export LIBOGC_INC := $(DEVKITPRO)/libogc2/include export LIBOGC_LIB := $(DEVKITPRO)/libogc2/lib/wii +export FREETYPE_CFLAGS := `$(DEVKITPRO)/portlibs/ppc/bin/powerpc-eabi-pkg-config --cflags freetype2` +export FREETYPE_LIBS := `$(DEVKITPRO)/portlibs/ppc/bin/powerpc-eabi-pkg-config --libs freetype2` #--------------------------------------------------------------------------------- # TARGET is the name of the output @@ -30,7 +32,7 @@ INCLUDES := source #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- -SHAREDFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) `freetype-config --cflags` \ +SHAREDFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) $(FREETYPE_CFLAGS) \ -DFRAMESKIP -DPSS_STYLE=1 -DPATH_MAX=1024 -DHAVE_ASPRINTF \ -D_SZ_ONE_DIRECTORY -D_LZMA_IN_CB -D_LZMA_OUT_READ -DNOUNCRYPT \ -fomit-frame-pointer \ @@ -46,7 +48,7 @@ LDFLAGS += -L../buildtools #--------------------------------------------------------------------------------- # any extra libraries we wish to link with the project #--------------------------------------------------------------------------------- -LIBS := -ldi -liso9660 -lpng -lmxml `freetype-config --libs` \ +LIBS := -ldi -liso9660 -lpng -lmxml $(FREETYPE_LIBS) \ -lfat -lwiiuse -lz -lbte -lasnd -logc -lvorbisidec -logg -ltinysmb #--------------------------------------------------------------------------------- From 94eb982c5eb5a0b7eff9fe57d2bb33a09ea089fb Mon Sep 17 00:00:00 2001 From: Mitchell Rysavy Date: Sun, 29 Jun 2025 08:27:28 -0400 Subject: [PATCH 2/2] Add GC Loader to filebrowser.cpp --- source/filebrowser.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/source/filebrowser.cpp b/source/filebrowser.cpp index e0640391..947fbf92 100644 --- a/source/filebrowser.cpp +++ b/source/filebrowser.cpp @@ -644,6 +644,14 @@ int BrowserChangeFolder() browserList[i].isdir = 1; browserList[i].icon = ICON_SD; i++; + + AddBrowserEntry(); + sprintf(browserList[i].filename, "gcloader:/"); + sprintf(browserList[i].displayname, "GC Loader"); + browserList[i].length = 0; + browserList[i].isdir = 1; + browserList[i].icon = ICON_SD; + i++; #endif AddBrowserEntry(); sprintf(browserList[i].filename, "smb:/");