diff --git a/Makefile.gc b/Makefile.gc index fe155a7..ccf5f49 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 source/vba # options for code generation #--------------------------------------------------------------------------------- -CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) `freetype-config --cflags` \ +CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) $(FREETYPE_CFLAGS) \ -DNO_SOUND -DUSE_VM -DWORDS_BIGENDIAN -DNO_LINK -DNO_FEX \ -DTILED_RENDERING \ -DC_CORE -D__ppc__ -D__POWERPC__ -DFINAL_VERSION \ @@ -48,7 +50,7 @@ LDFLAGS += -L../buildtools #--------------------------------------------------------------------------------- # any extra libraries we wish to link with #--------------------------------------------------------------------------------- -LIBS := -lpng -lmxml -ltinysmb -lbba -lfat -liso9660 -lz -logc `freetype-config --libs` +LIBS := -lpng -lmxml -ltinysmb -lbba -lfat -liso9660 -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 3154b45..3c69451 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 source/vba # options for code generation #--------------------------------------------------------------------------------- -CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) `freetype-config --cflags` \ +CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) $(FREETYPE_CFLAGS) \ -DWORDS_BIGENDIAN -DNO_LINK -DNO_FEX \ -DTILED_RENDERING \ -DC_CORE -D__ppc__ -D__POWERPC__ -DFINAL_VERSION \ @@ -49,7 +51,7 @@ LDFLAGS += -L../buildtools # any extra libraries we wish to link with #--------------------------------------------------------------------------------- LIBS := -ldi -liso9660 -lpng -lmxml -lfat -lwiiuse -lz -lbte -lasnd -logc \ - -lvorbisidec -logg -ltinysmb `freetype-config --libs` + -lvorbisidec -logg -ltinysmb $(FREETYPE_LIBS) #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing diff --git a/source/filebrowser.cpp b/source/filebrowser.cpp index dd9a6e7..091c315 100644 --- a/source/filebrowser.cpp +++ b/source/filebrowser.cpp @@ -618,6 +618,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:/");