From 4a4a931797cef29f605bb4f1f0ee02f90a7347bb Mon Sep 17 00:00:00 2001 From: Crayon2000 Date: Thu, 26 Nov 2009 19:52:20 +0000 Subject: [PATCH] [CHG] No need to include base_rules in Makefile now that dekitPro 18 is needed to compile the library --- GRRLIB/GRRLIB/Makefile | 9 +++++---- GRRLIB/lib/pngu/Makefile | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/GRRLIB/GRRLIB/Makefile b/GRRLIB/GRRLIB/Makefile index c889e82..c84ac74 100644 --- a/GRRLIB/GRRLIB/Makefile +++ b/GRRLIB/GRRLIB/Makefile @@ -11,11 +11,12 @@ endif NULLSTR := PWD := $(subst $(NULLSTR) ,\ ,$(shell pwd)) -include $(DEVKITPPC)/base_rules +PREFIX := $(DEVKITPPC)/bin/powerpc-eabi- +CC := $(PREFIX)gcc +AR := $(PREFIX)ar -OGC := $(DEVKITPRO)/libogc -INCD := $(OGC)/include -LIBD := $(OGC)/lib/wii +INCD := $(DEVKITPRO)/libogc/include +LIBD := $(DEVKITPRO)/libogc/lib/wii MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float CFLAGS := -O2 -Wall $(MACHDEP) -I$(PWD) -I$(INCD) diff --git a/GRRLIB/lib/pngu/Makefile b/GRRLIB/lib/pngu/Makefile index 0a10702..75310ad 100644 --- a/GRRLIB/lib/pngu/Makefile +++ b/GRRLIB/lib/pngu/Makefile @@ -8,11 +8,12 @@ ifeq ($(strip $(DEVKITPRO)),) $(error "Use export DEVKITPRO=devkitPRO and try again") endif -include $(DEVKITPPC)/base_rules +PREFIX := $(DEVKITPPC)/bin/powerpc-eabi- +CC := $(PREFIX)gcc +AR := $(PREFIX)ar -OGC := $(DEVKITPRO)/libogc -INCD := $(OGC)/include -LIBD := $(OGC)/lib/wii +INCD := $(DEVKITPRO)/libogc/include +LIBD := $(DEVKITPRO)/libogc/lib/wii MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float CFLAGS := -O2 -Wall $(MACHDEP) -I $(INCD)