Skip to content

Add GC Loader to filebrowser.cpp and use pkg-config for freetype #483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dborth merged 2 commits into from
Jun 29, 2025
Merged

Add GC Loader to filebrowser.cpp and use pkg-config for freetype #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
103af31
Use pkg-config for freetype cflags and libs
mrysav Jun 29, 2025
b677ed0
Add GC Loader to filebrowser.cpp
mrysav Jun 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Makefile.gc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions Makefile.wii
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand All @@ -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
Expand Down
8 changes: 8 additions & 0 deletions source/filebrowser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:/");
Expand Down