From 0405a570010a4d7e84a0e00a4043025d9b0a10d5 Mon Sep 17 00:00:00 2001 From: Crayon2000 Date: Fri, 13 Feb 2009 21:50:12 +0000 Subject: [PATCH] [CHG] Defined the path of GRRLIB in Makefiles for easier modification --- examples/{demo-01 => lesson1}/Makefile | 5 +++-- examples/{demo-01 => lesson1}/source/gfx/BMfont1.c | 0 examples/{demo-01 => lesson1}/source/gfx/BMfont1.h | 0 .../{demo-01 => lesson1}/source/gfx/BMfont1.png | Bin examples/{demo-01 => lesson1}/source/gfx/BMfont2.c | 0 examples/{demo-01 => lesson1}/source/gfx/BMfont2.h | 0 .../{demo-01 => lesson1}/source/gfx/BMfont2.png | Bin examples/{demo-01 => lesson1}/source/gfx/BMfont3.c | 0 examples/{demo-01 => lesson1}/source/gfx/BMfont3.h | 0 .../{demo-01 => lesson1}/source/gfx/BMfont3.png | Bin examples/{demo-01 => lesson1}/source/gfx/BMfont4.c | 0 examples/{demo-01 => lesson1}/source/gfx/BMfont4.h | 0 .../{demo-01 => lesson1}/source/gfx/BMfont4.png | Bin examples/{demo-01 => lesson1}/source/gfx/BMfont5.h | 0 .../{demo-01 => lesson1}/source/gfx/BMfont5.png | Bin examples/{demo-01 => lesson1}/source/gfx/sprite.h | 0 examples/{demo-01 => lesson1}/source/gfx/sprite.png | Bin examples/{demo-01 => lesson1}/source/gfx/test_jpg.c | 0 examples/{demo-01 => lesson1}/source/gfx/test_jpg.h | 0 .../{demo-01 => lesson1}/source/gfx/test_jpg.jpg | Bin examples/{demo-01 => lesson1}/source/main.c | 0 examples/template/Makefile | 5 +++-- 22 files changed, 6 insertions(+), 4 deletions(-) rename examples/{demo-01 => lesson1}/Makefile (97%) rename examples/{demo-01 => lesson1}/source/gfx/BMfont1.c (100%) rename examples/{demo-01 => lesson1}/source/gfx/BMfont1.h (100%) rename examples/{demo-01 => lesson1}/source/gfx/BMfont1.png (100%) rename examples/{demo-01 => lesson1}/source/gfx/BMfont2.c (100%) rename examples/{demo-01 => lesson1}/source/gfx/BMfont2.h (100%) rename examples/{demo-01 => lesson1}/source/gfx/BMfont2.png (100%) rename examples/{demo-01 => lesson1}/source/gfx/BMfont3.c (100%) rename examples/{demo-01 => lesson1}/source/gfx/BMfont3.h (100%) rename examples/{demo-01 => lesson1}/source/gfx/BMfont3.png (100%) rename examples/{demo-01 => lesson1}/source/gfx/BMfont4.c (100%) rename examples/{demo-01 => lesson1}/source/gfx/BMfont4.h (100%) rename examples/{demo-01 => lesson1}/source/gfx/BMfont4.png (100%) rename examples/{demo-01 => lesson1}/source/gfx/BMfont5.h (100%) rename examples/{demo-01 => lesson1}/source/gfx/BMfont5.png (100%) rename examples/{demo-01 => lesson1}/source/gfx/sprite.h (100%) rename examples/{demo-01 => lesson1}/source/gfx/sprite.png (100%) rename examples/{demo-01 => lesson1}/source/gfx/test_jpg.c (100%) rename examples/{demo-01 => lesson1}/source/gfx/test_jpg.h (100%) rename examples/{demo-01 => lesson1}/source/gfx/test_jpg.jpg (100%) rename examples/{demo-01 => lesson1}/source/main.c (100%) diff --git a/examples/demo-01/Makefile b/examples/lesson1/Makefile similarity index 97% rename from examples/demo-01/Makefile rename to examples/lesson1/Makefile index 814ac9f..d988815 100644 --- a/examples/demo-01/Makefile +++ b/examples/lesson1/Makefile @@ -15,9 +15,10 @@ include $(DEVKITPPC)/wii_rules # SOURCES is a list of directories containing source code # INCLUDES is a list of directories containing extra header files #--------------------------------------------------------------------------------- +GRRLIB := ../../GRRLIB TARGET := $(notdir $(CURDIR)) BUILD := build -SOURCES := source source/gfx ../../GRRLIB/GRRLIB ../../GRRLIB/lib/libpng ../../GRRLIB/lib/libpng/pngu +SOURCES := source source/gfx $(GRRLIB)/GRRLIB $(GRRLIB)/lib/libpng/pngu DATA := data INCLUDES := @@ -39,7 +40,7 @@ LIBS := -lpng -ljpeg -lz -lfat -lwiiuse -lbte -logc -lm # list of directories containing libraries, this must be the top level containing # include and lib #--------------------------------------------------------------------------------- -LIBDIRS := $(CURDIR)/../../GRRLIB +LIBDIRS := $(CURDIR)/$(GRRLIB) #--------------------------------------------------------------------------------- # no real need to edit anything past this point unless you need to add additional diff --git a/examples/demo-01/source/gfx/BMfont1.c b/examples/lesson1/source/gfx/BMfont1.c similarity index 100% rename from examples/demo-01/source/gfx/BMfont1.c rename to examples/lesson1/source/gfx/BMfont1.c diff --git a/examples/demo-01/source/gfx/BMfont1.h b/examples/lesson1/source/gfx/BMfont1.h similarity index 100% rename from examples/demo-01/source/gfx/BMfont1.h rename to examples/lesson1/source/gfx/BMfont1.h diff --git a/examples/demo-01/source/gfx/BMfont1.png b/examples/lesson1/source/gfx/BMfont1.png similarity index 100% rename from examples/demo-01/source/gfx/BMfont1.png rename to examples/lesson1/source/gfx/BMfont1.png diff --git a/examples/demo-01/source/gfx/BMfont2.c b/examples/lesson1/source/gfx/BMfont2.c similarity index 100% rename from examples/demo-01/source/gfx/BMfont2.c rename to examples/lesson1/source/gfx/BMfont2.c diff --git a/examples/demo-01/source/gfx/BMfont2.h b/examples/lesson1/source/gfx/BMfont2.h similarity index 100% rename from examples/demo-01/source/gfx/BMfont2.h rename to examples/lesson1/source/gfx/BMfont2.h diff --git a/examples/demo-01/source/gfx/BMfont2.png b/examples/lesson1/source/gfx/BMfont2.png similarity index 100% rename from examples/demo-01/source/gfx/BMfont2.png rename to examples/lesson1/source/gfx/BMfont2.png diff --git a/examples/demo-01/source/gfx/BMfont3.c b/examples/lesson1/source/gfx/BMfont3.c similarity index 100% rename from examples/demo-01/source/gfx/BMfont3.c rename to examples/lesson1/source/gfx/BMfont3.c diff --git a/examples/demo-01/source/gfx/BMfont3.h b/examples/lesson1/source/gfx/BMfont3.h similarity index 100% rename from examples/demo-01/source/gfx/BMfont3.h rename to examples/lesson1/source/gfx/BMfont3.h diff --git a/examples/demo-01/source/gfx/BMfont3.png b/examples/lesson1/source/gfx/BMfont3.png similarity index 100% rename from examples/demo-01/source/gfx/BMfont3.png rename to examples/lesson1/source/gfx/BMfont3.png diff --git a/examples/demo-01/source/gfx/BMfont4.c b/examples/lesson1/source/gfx/BMfont4.c similarity index 100% rename from examples/demo-01/source/gfx/BMfont4.c rename to examples/lesson1/source/gfx/BMfont4.c diff --git a/examples/demo-01/source/gfx/BMfont4.h b/examples/lesson1/source/gfx/BMfont4.h similarity index 100% rename from examples/demo-01/source/gfx/BMfont4.h rename to examples/lesson1/source/gfx/BMfont4.h diff --git a/examples/demo-01/source/gfx/BMfont4.png b/examples/lesson1/source/gfx/BMfont4.png similarity index 100% rename from examples/demo-01/source/gfx/BMfont4.png rename to examples/lesson1/source/gfx/BMfont4.png diff --git a/examples/demo-01/source/gfx/BMfont5.h b/examples/lesson1/source/gfx/BMfont5.h similarity index 100% rename from examples/demo-01/source/gfx/BMfont5.h rename to examples/lesson1/source/gfx/BMfont5.h diff --git a/examples/demo-01/source/gfx/BMfont5.png b/examples/lesson1/source/gfx/BMfont5.png similarity index 100% rename from examples/demo-01/source/gfx/BMfont5.png rename to examples/lesson1/source/gfx/BMfont5.png diff --git a/examples/demo-01/source/gfx/sprite.h b/examples/lesson1/source/gfx/sprite.h similarity index 100% rename from examples/demo-01/source/gfx/sprite.h rename to examples/lesson1/source/gfx/sprite.h diff --git a/examples/demo-01/source/gfx/sprite.png b/examples/lesson1/source/gfx/sprite.png similarity index 100% rename from examples/demo-01/source/gfx/sprite.png rename to examples/lesson1/source/gfx/sprite.png diff --git a/examples/demo-01/source/gfx/test_jpg.c b/examples/lesson1/source/gfx/test_jpg.c similarity index 100% rename from examples/demo-01/source/gfx/test_jpg.c rename to examples/lesson1/source/gfx/test_jpg.c diff --git a/examples/demo-01/source/gfx/test_jpg.h b/examples/lesson1/source/gfx/test_jpg.h similarity index 100% rename from examples/demo-01/source/gfx/test_jpg.h rename to examples/lesson1/source/gfx/test_jpg.h diff --git a/examples/demo-01/source/gfx/test_jpg.jpg b/examples/lesson1/source/gfx/test_jpg.jpg similarity index 100% rename from examples/demo-01/source/gfx/test_jpg.jpg rename to examples/lesson1/source/gfx/test_jpg.jpg diff --git a/examples/demo-01/source/main.c b/examples/lesson1/source/main.c similarity index 100% rename from examples/demo-01/source/main.c rename to examples/lesson1/source/main.c diff --git a/examples/template/Makefile b/examples/template/Makefile index 814ac9f..d988815 100644 --- a/examples/template/Makefile +++ b/examples/template/Makefile @@ -15,9 +15,10 @@ include $(DEVKITPPC)/wii_rules # SOURCES is a list of directories containing source code # INCLUDES is a list of directories containing extra header files #--------------------------------------------------------------------------------- +GRRLIB := ../../GRRLIB TARGET := $(notdir $(CURDIR)) BUILD := build -SOURCES := source source/gfx ../../GRRLIB/GRRLIB ../../GRRLIB/lib/libpng ../../GRRLIB/lib/libpng/pngu +SOURCES := source source/gfx $(GRRLIB)/GRRLIB $(GRRLIB)/lib/libpng/pngu DATA := data INCLUDES := @@ -39,7 +40,7 @@ LIBS := -lpng -ljpeg -lz -lfat -lwiiuse -lbte -logc -lm # list of directories containing libraries, this must be the top level containing # include and lib #--------------------------------------------------------------------------------- -LIBDIRS := $(CURDIR)/../../GRRLIB +LIBDIRS := $(CURDIR)/$(GRRLIB) #--------------------------------------------------------------------------------- # no real need to edit anything past this point unless you need to add additional