From 174dd71c43d82967c413c82c57d91c2a84f84080 Mon Sep 17 00:00:00 2001 From: Crayon2000 Date: Thu, 8 Apr 2010 21:04:48 +0000 Subject: [PATCH] [CHG] Libraries that have dependencies (libpng and libpngu) now look in the GRRLIB lib folder before looking in the libogc folder --- GRRLIB/GRRLIB/Makefile | 3 ++- GRRLIB/lib/jpeg/Makefile | 3 ++- GRRLIB/lib/png/Makefile | 3 ++- GRRLIB/lib/pngu/Makefile | 3 ++- GRRLIB/lib/zlib/Makefile | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/GRRLIB/GRRLIB/Makefile b/GRRLIB/GRRLIB/Makefile index 7c9dc31..9221dbf 100644 --- a/GRRLIB/GRRLIB/Makefile +++ b/GRRLIB/GRRLIB/Makefile @@ -18,8 +18,9 @@ AR := $(PREFIX)ar LIBOGC_INC := $(DEVKITPRO)/libogc/include LIBOGC_LIB := $(DEVKITPRO)/libogc/lib/wii +INCLUDE := -I$(PWD) -I$(LIBOGC_INC) MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float -CFLAGS := -O2 -Wall $(MACHDEP) -I$(PWD) -I$(LIBOGC_INC) +CFLAGS := -O2 -Wall $(MACHDEP) $(INCLUDE) LIB := grrlib CFILES := $(wildcard *.c) diff --git a/GRRLIB/lib/jpeg/Makefile b/GRRLIB/lib/jpeg/Makefile index ba8a6f6..116076d 100644 --- a/GRRLIB/lib/jpeg/Makefile +++ b/GRRLIB/lib/jpeg/Makefile @@ -15,8 +15,9 @@ AR := $(PREFIX)ar LIBOGC_INC := $(DEVKITPRO)/libogc/include LIBOGC_LIB := $(DEVKITPRO)/libogc/lib/wii +INCLUDE := MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float -CFLAGS := -O2 $(MACHDEP) +CFLAGS := -O2 $(MACHDEP) $(INCLUDE) LIB := jpeg CFILES := $(wildcard *.c) diff --git a/GRRLIB/lib/png/Makefile b/GRRLIB/lib/png/Makefile index 4213d3f..1d240ae 100644 --- a/GRRLIB/lib/png/Makefile +++ b/GRRLIB/lib/png/Makefile @@ -15,8 +15,9 @@ AR := $(PREFIX)ar LIBOGC_INC := $(DEVKITPRO)/libogc/include LIBOGC_LIB := $(DEVKITPRO)/libogc/lib/wii +INCLUDE := -I../zlib -I$(LIBOGC_INC) MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float -CFLAGS := -O2 -Wall $(MACHDEP) -I $(LIBOGC_INC) +CFLAGS := -O2 -Wall $(MACHDEP) $(INCLUDE) LIB := png CFILES := $(wildcard *.c) diff --git a/GRRLIB/lib/pngu/Makefile b/GRRLIB/lib/pngu/Makefile index cae2512..5fb98c1 100644 --- a/GRRLIB/lib/pngu/Makefile +++ b/GRRLIB/lib/pngu/Makefile @@ -15,8 +15,9 @@ AR := $(PREFIX)ar LIBOGC_INC := $(DEVKITPRO)/libogc/include LIBOGC_LIB := $(DEVKITPRO)/libogc/lib/wii +INCLUDE := -I../zlib -I../png -I$(LIBOGC_INC) MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float -CFLAGS := -O2 -Wall $(MACHDEP) -I $(LIBOGC_INC) +CFLAGS := -O2 -Wall $(MACHDEP) $(INCLUDE) LIB := pngu CFILES := $(wildcard *.c) diff --git a/GRRLIB/lib/zlib/Makefile b/GRRLIB/lib/zlib/Makefile index c46738a..b4411e1 100644 --- a/GRRLIB/lib/zlib/Makefile +++ b/GRRLIB/lib/zlib/Makefile @@ -15,8 +15,9 @@ AR := $(PREFIX)ar LIBOGC_INC := $(DEVKITPRO)/libogc/include LIBOGC_LIB := $(DEVKITPRO)/libogc/lib/wii +INCLUDE := MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float -CFLAGS := -O2 -Wall $(MACHDEP) -I $(LIBOGC_INC) +CFLAGS := -O2 -Wall $(MACHDEP) $(INCLUDE) LIB := zlib CFILES := $(wildcard *.c)