From ee94dd4dac05572c0616c7bcb8901cd28238b95e Mon Sep 17 00:00:00 2001 From: Crayon2000 Date: Tue, 3 Nov 2015 09:14:13 -0500 Subject: [PATCH] Makefiles were changed to allow compilation on GameCube and Wii. To compile on GameCube use this: make PLATFORM=cube clean all install If PLATFORM is not specified or set to anything else it will compile for Wii. --- .travis.yml | 3 ++- GRRLIB/GRRLIB/Makefile | 10 +++++----- GRRLIB/lib/freetype/Makefile | 10 ++++++---- GRRLIB/lib/freetype/builds/compiler/wii.mk | 4 ---- GRRLIB/lib/jpeg/Makefile | 10 +++++----- GRRLIB/lib/png/Makefile | 10 +++++----- GRRLIB/lib/pngu/Makefile | 10 +++++----- GRRLIB/lib/zlib/Makefile | 10 +++++----- README.md | 2 +- 9 files changed, 34 insertions(+), 35 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0512cb3..d0cbccd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,4 +16,5 @@ install: script: - cd GRRLIB && sudo -E make clean all install && cd .. - - cd examples && make && cd .. \ No newline at end of file + - cd examples && make && cd .. + - cd GRRLIB && sudo -E make PLATFORM=cube clean all && cd .. diff --git a/GRRLIB/GRRLIB/Makefile b/GRRLIB/GRRLIB/Makefile index 690c947..19b29bc 100644 --- a/GRRLIB/GRRLIB/Makefile +++ b/GRRLIB/GRRLIB/Makefile @@ -10,16 +10,16 @@ ifeq ($(strip $(DEVKITPRO)),) $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=devkitPro) endif -include $(DEVKITPPC)/base_rules +ifeq ($(PLATFORM),cube) +include $(DEVKITPPC)/gamecube_rules +else +include $(DEVKITPPC)/wii_rules +endif NULLSTR := PWD := $(subst $(NULLSTR) ,\ ,$(shell pwd)) -LIBOGC_INC := $(DEVKITPRO)/libogc/include -LIBOGC_LIB := $(DEVKITPRO)/libogc/lib/wii - INCLUDE := -I../lib/jpeg -I../lib/pngu -I../lib/freetype/include -I$(PWD) -I$(LIBOGC_INC) -MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float CFLAGS := -O2 -Wall $(MACHDEP) $(INCLUDE) LIB := grrlib diff --git a/GRRLIB/lib/freetype/Makefile b/GRRLIB/lib/freetype/Makefile index 82bc5a5..f7258fb 100644 --- a/GRRLIB/lib/freetype/Makefile +++ b/GRRLIB/lib/freetype/Makefile @@ -10,6 +10,12 @@ ifeq ($(strip $(DEVKITPRO)),) $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=devkitPro) endif +ifeq ($(PLATFORM),cube) +include $(DEVKITPPC)/gamecube_rules +else +include $(DEVKITPPC)/wii_rules +endif + # FreeType Makefile PROJECT := freetype PROJECT_TITLE := FreeType @@ -17,10 +23,6 @@ TOP_DIR ?= . OBJ_DIR ?= $(TOP_DIR) include $(TOP_DIR)/builds/toplevel.mk - -LIBOGC_INC := $(DEVKITPRO)/libogc/include -LIBOGC_LIB := $(DEVKITPRO)/libogc/lib/wii - clean : rm -f lib$(PROJECT).a ftmodule.h diff --git a/GRRLIB/lib/freetype/builds/compiler/wii.mk b/GRRLIB/lib/freetype/builds/compiler/wii.mk index 93d86c2..df5e7a9 100644 --- a/GRRLIB/lib/freetype/builds/compiler/wii.mk +++ b/GRRLIB/lib/freetype/builds/compiler/wii.mk @@ -9,9 +9,6 @@ # indicate that you have read the license and understand and accept it # fully. -# devkitPPC base rules -include $(DEVKITPPC)/base_rules - # Compiler command line name # COMPILER_SEP := $(SEP) @@ -60,7 +57,6 @@ T := -o$(space) # Use the ANSIFLAGS variable to define the compiler flags used to enfore # ANSI compliance. # -MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float CFLAGS ?= -c -O2 -Wall $(MACHDEP) -I$(TOP_DIR)/include # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. diff --git a/GRRLIB/lib/jpeg/Makefile b/GRRLIB/lib/jpeg/Makefile index db31d91..d7ce09f 100644 --- a/GRRLIB/lib/jpeg/Makefile +++ b/GRRLIB/lib/jpeg/Makefile @@ -10,13 +10,13 @@ ifeq ($(strip $(DEVKITPRO)),) $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=devkitPro) endif -include $(DEVKITPPC)/base_rules - -LIBOGC_INC := $(DEVKITPRO)/libogc/include -LIBOGC_LIB := $(DEVKITPRO)/libogc/lib/wii +ifeq ($(PLATFORM),cube) +include $(DEVKITPPC)/gamecube_rules +else +include $(DEVKITPPC)/wii_rules +endif INCLUDE := -MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float CFLAGS := -O2 $(MACHDEP) $(INCLUDE) LIB := jpeg diff --git a/GRRLIB/lib/png/Makefile b/GRRLIB/lib/png/Makefile index a6c6fd5..5f3f733 100644 --- a/GRRLIB/lib/png/Makefile +++ b/GRRLIB/lib/png/Makefile @@ -10,13 +10,13 @@ ifeq ($(strip $(DEVKITPRO)),) $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=devkitPro) endif -include $(DEVKITPPC)/base_rules - -LIBOGC_INC := $(DEVKITPRO)/libogc/include -LIBOGC_LIB := $(DEVKITPRO)/libogc/lib/wii +ifeq ($(PLATFORM),cube) +include $(DEVKITPPC)/gamecube_rules +else +include $(DEVKITPPC)/wii_rules +endif INCLUDE := -I../zlib -I$(LIBOGC_INC) -MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float CFLAGS := -O2 -Wall $(MACHDEP) $(INCLUDE) LIB := png diff --git a/GRRLIB/lib/pngu/Makefile b/GRRLIB/lib/pngu/Makefile index 2ef38f0..4402680 100644 --- a/GRRLIB/lib/pngu/Makefile +++ b/GRRLIB/lib/pngu/Makefile @@ -10,13 +10,13 @@ ifeq ($(strip $(DEVKITPRO)),) $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=devkitPro) endif -include $(DEVKITPPC)/base_rules - -LIBOGC_INC := $(DEVKITPRO)/libogc/include -LIBOGC_LIB := $(DEVKITPRO)/libogc/lib/wii +ifeq ($(PLATFORM),cube) +include $(DEVKITPPC)/gamecube_rules +else +include $(DEVKITPPC)/wii_rules +endif INCLUDE := -I../zlib -I../png -I$(LIBOGC_INC) -MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float CFLAGS := -O2 -Wall $(MACHDEP) $(INCLUDE) LIB := pngu diff --git a/GRRLIB/lib/zlib/Makefile b/GRRLIB/lib/zlib/Makefile index a4b530d..f67354b 100644 --- a/GRRLIB/lib/zlib/Makefile +++ b/GRRLIB/lib/zlib/Makefile @@ -10,13 +10,13 @@ ifeq ($(strip $(DEVKITPRO)),) $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=devkitPro) endif -include $(DEVKITPPC)/base_rules - -LIBOGC_INC := $(DEVKITPRO)/libogc/include -LIBOGC_LIB := $(DEVKITPRO)/libogc/lib/wii +ifeq ($(PLATFORM),cube) +include $(DEVKITPPC)/gamecube_rules +else +include $(DEVKITPPC)/wii_rules +endif INCLUDE := -MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float CFLAGS := -O2 -Wall $(MACHDEP) $(INCLUDE) LIB := zlib diff --git a/README.md b/README.md index 2a9f3e7..9422cb0 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ libpngu is supplied as source code libpng is supplied as source code libz is supplied as source code libfreetype is supplied as source code -libfat is supplied with devkitpro (i.e. preinstalled) +libfat is supplied with devkitPro (i.e. preinstalled) ``` The easy way is to install GRRLIB and all the required libraries in a single