allow passing HAVE_OGG_OGC to link to needed OGG libs in PPC portlibs, needed for a few cores.
This commit is contained in:
parent
57c790646f
commit
5ed20207f5
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue