From fb568a0e292d25c0db087dd0bd4baa8f8d657ee9 Mon Sep 17 00:00:00 2001 From: Crayon2000 Date: Sun, 27 Jun 2021 12:46:12 -0400 Subject: [PATCH] Installation folders for Wii and GameCube are different --- .github/workflows/ci.yml | 2 +- GRRLIB/GRRLIB/Makefile | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64a8afd..5e22620 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: run: | (cd GRRLIB && make clean all install) (cd examples && make) - (cd GRRLIB && make PLATFORM=cube clean all) + (cd GRRLIB && make PLATFORM=cube clean all install) - uses: actions/upload-artifact@master with: diff --git a/GRRLIB/GRRLIB/Makefile b/GRRLIB/GRRLIB/Makefile index bfb09a7..d06df4b 100644 --- a/GRRLIB/GRRLIB/Makefile +++ b/GRRLIB/GRRLIB/Makefile @@ -12,16 +12,23 @@ endif ifeq ($(PLATFORM),cube) include $(DEVKITPPC)/gamecube_rules + +MACHDEP += -DHW_DOL + +INSTALL_INC := $(DEVKITPRO)/portlibs/gamecube/include +INSTALL_LIB := $(DEVKITPRO)/portlibs/gamecube/lib else include $(DEVKITPPC)/wii_rules + +MACHDEP += -DHW_RVL + +INSTALL_INC := $(DEVKITPRO)/portlibs/wii/include +INSTALL_LIB := $(DEVKITPRO)/portlibs/wii/lib endif NULLSTR := PWD := $(subst $(NULLSTR) ,\ ,$(shell pwd)) -INSTALL_INC := $(DEVKITPRO)/portlibs/ppc/include -INSTALL_LIB := $(DEVKITPRO)/portlibs/ppc/lib - INCLUDE := -I../lib/pngu -I$(PWD) -I$(LIBOGC_INC) -I$(DEVKITPRO)/portlibs/ppc/include -I$(DEVKITPRO)/portlibs/ppc/include/freetype2 CFLAGS := -O2 -Wall $(MACHDEP) $(INCLUDE)