From 5ed20207f533df18d724992e4d802589bbb71653 Mon Sep 17 00:00:00 2001 From: saulfabreg Wii VC Project Date: Thu, 17 Jul 2025 18:28:49 -0500 Subject: [PATCH] allow passing HAVE_OGG_OGC to link to needed OGG libs in PPC portlibs, needed for a few cores. --- Makefile.griffin | 5 +++++ Makefile.ngc | 5 +++++ Makefile.wii | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/Makefile.griffin b/Makefile.griffin index 1fd4ef78c4..c3b5ec28dd 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -116,6 +116,7 @@ else ifeq ($(platform), ps3-cobra) # NGC/Wii - libogc else ifeq ($(libogc_platform), 1) EXTERNAL_LIBOGC ?= 0 + HAVE_OGG_OGC ?= 0 GX_PTHREAD_LEGACY ?= 1 CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT) CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT) @@ -183,6 +184,10 @@ else ifeq ($(libogc_platform), 1) endif endif + ifeq ($(HAVE_OGG_OGC), 1) + LIBS += -L$(DEVKITPRO)/portlibs/ppc/lib -lvorbisfile -lvorbis -logg + endif + ifeq ($(EXTERNAL_LIBOGC), 1) LIBS += -lfat endif diff --git a/Makefile.ngc b/Makefile.ngc index 432ed36e8f..7180a94e3c 100644 --- a/Makefile.ngc +++ b/Makefile.ngc @@ -58,6 +58,7 @@ LIBS := $(WHOLE_START) $(LIB_CORE) $(WHOLE_END) libogc_platform := 1 EXTERNAL_LIBOGC ?= 0 +HAVE_OGG_OGC ?= 0 GX_PTHREAD_LEGACY ?= 1 CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT) CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT) @@ -102,6 +103,10 @@ ifeq ($(BIG_STACK), 1) LDFLAGS += -T bootstrap/gx/ogc.ld endif +ifeq ($(HAVE_OGG_OGC), 1) + LIBS += -L$(DEVKITPRO)/portlibs/ppc/lib -lvorbisfile -lvorbis -logg +endif + ifeq ($(EXTERNAL_LIBOGC), 1) LIBS += -lfat endif diff --git a/Makefile.wii b/Makefile.wii index 3f702da3df..a80a6f0600 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -61,6 +61,7 @@ LIBS := $(WHOLE_START) $(LIB_CORE) $(WHOLE_END) libogc_platform := 1 EXTERNAL_LIBOGC ?= 0 +HAVE_OGG_OGC ?= 0 GX_PTHREAD_LEGACY ?= 1 CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT) CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT) @@ -105,6 +106,10 @@ ifeq ($(BIG_STACK), 1) LDFLAGS += -T bootstrap/gx/rvl.ld endif +ifeq ($(HAVE_OGG_OGC), 1) + LIBS += -L$(DEVKITPRO)/portlibs/ppc/lib -lvorbisfile -lvorbis -logg +endif + ifeq ($(EXTERNAL_LIBOGC), 1) LIBS += -lfat endif