diff --git a/GRRLIB/GRRLIB/Makefile b/GRRLIB/GRRLIB/Makefile index 9221dbf..8e619b9 100644 --- a/GRRLIB/GRRLIB/Makefile +++ b/GRRLIB/GRRLIB/Makefile @@ -18,7 +18,7 @@ AR := $(PREFIX)ar LIBOGC_INC := $(DEVKITPRO)/libogc/include LIBOGC_LIB := $(DEVKITPRO)/libogc/lib/wii -INCLUDE := -I$(PWD) -I$(LIBOGC_INC) +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) diff --git a/GRRLIB/Makefile b/GRRLIB/Makefile new file mode 100644 index 0000000..68b999c --- /dev/null +++ b/GRRLIB/Makefile @@ -0,0 +1,25 @@ +SUBDIRS:= `ls | egrep -v '^(\.svn)$$'` + +all: + @for i in $(SUBDIRS); do \ + if test -e $$i/Makefile ; then \ + echo "-----------------------------------------------------------";\ + $(MAKE) -C $$i || { exit 1;} \ + fi; \ + done; + +clean: + @rm -f *.bz2 + @for i in $(SUBDIRS); do \ + if test -e $$i/Makefile ; then \ + $(MAKE) -C $$i clean || { exit 1;} \ + fi; \ + done; + +install: + @rm -f *.bz2 + @for i in $(SUBDIRS); do \ + if test -e $$i/Makefile ; then \ + $(MAKE) -C $$i install || { exit 1;} \ + fi; \ + done; \ No newline at end of file diff --git a/GRRLIB/lib/Makefile b/GRRLIB/lib/Makefile new file mode 100644 index 0000000..68b999c --- /dev/null +++ b/GRRLIB/lib/Makefile @@ -0,0 +1,25 @@ +SUBDIRS:= `ls | egrep -v '^(\.svn)$$'` + +all: + @for i in $(SUBDIRS); do \ + if test -e $$i/Makefile ; then \ + echo "-----------------------------------------------------------";\ + $(MAKE) -C $$i || { exit 1;} \ + fi; \ + done; + +clean: + @rm -f *.bz2 + @for i in $(SUBDIRS); do \ + if test -e $$i/Makefile ; then \ + $(MAKE) -C $$i clean || { exit 1;} \ + fi; \ + done; + +install: + @rm -f *.bz2 + @for i in $(SUBDIRS); do \ + if test -e $$i/Makefile ; then \ + $(MAKE) -C $$i install || { exit 1;} \ + fi; \ + done; \ No newline at end of file diff --git a/GRRLIB/lib/install.bat b/GRRLIB/lib/install.bat deleted file mode 100644 index a2a8c06..0000000 --- a/GRRLIB/lib/install.bat +++ /dev/null @@ -1,117 +0,0 @@ -@echo off - -Rem -- Quick'n'dirty library installation util [BC] - -Rem -- zlib library -echo. -echo --------------------------------------------------------------------------- -echo Building zlib Library... -echo. -cd zlib - make clean -s - if errorlevel 1 goto error - make all - if errorlevel 1 goto error -cd .. - -echo. -echo --------------------------------------------------------------------------- -echo Installing zlib Library... -echo. -cd zlib - make install - if errorlevel 1 goto error -cd .. - -Rem -- JPEG library -echo. -echo --------------------------------------------------------------------------- -echo Building JPEG Library... -echo. -cd jpeg - make clean -s - if errorlevel 1 goto error - make all - if errorlevel 1 goto error -cd .. - -echo. -echo --------------------------------------------------------------------------- -echo Installing JPEG Library... -echo. -cd jpeg - make install - if errorlevel 1 goto error -cd .. - -Rem -- PNG & PNGU libraries -echo. -echo --------------------------------------------------------------------------- -echo Building PNG Library... -echo. -cd png - make clean -s - if errorlevel 1 goto error - make all - if errorlevel 1 goto error -cd .. - -echo. -echo --------------------------------------------------------------------------- -echo Installing PNG Library... -echo. -cd png - make install - if errorlevel 1 goto error -cd .. - -echo. -echo --------------------------------------------------------------------------- -echo Building PNGU Library... -echo. -cd pngu - make clean -s - if errorlevel 1 goto error - make all - if errorlevel 1 goto error -cd .. - -echo. -echo --------------------------------------------------------------------------- -echo Installing PNGU Library... -echo. -cd pngu - make install - if errorlevel 1 goto error -cd .. - -Rem -- FreeType library -echo. -echo --------------------------------------------------------------------------- -echo Building FreeType Library... -echo. -cd freetype - make clean -s - if errorlevel 1 goto error - make all - if errorlevel 1 goto error -cd .. - -echo. -echo --------------------------------------------------------------------------- -echo Installing FreeType Library... -echo. -cd freetype - make install - if errorlevel 1 goto error -cd .. - -echo. -echo Done -goto end -:error -echo. -echo Installation Failed! -:end -Rem -- The End -echo. diff --git a/GRRLIB/lib/install.sh b/GRRLIB/lib/install.sh deleted file mode 100644 index 1a641da..0000000 --- a/GRRLIB/lib/install.sh +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -set -x - -# Quick'n'dirty library installation util [BC] - -# zlib library -echo -e "\n--------------------------------------------------------------------" -echo -e "Building zlib Library...\n" -cd zlib - make clean - make all -cd .. - -echo -e "\n--------------------------------------------------------------------" -echo -e "Installing zlib Library...\n" -pushd zlib - make install -popd - -# JPEG library -echo -e "\n--------------------------------------------------------------------" -echo -e "Building JPEG Library...\n" -cd jpeg - make clean - make all -cd .. - -echo -e "\n--------------------------------------------------------------------" -echo -e "Installing JPEG Library...\n" -pushd jpeg - make install -popd - -# PNG & PNGU libraries -echo -e "\n--------------------------------------------------------------------" -echo -e "Building PNG Library...\n" -cd png - make clean - make all -cd .. - -echo -e "\n--------------------------------------------------------------------" -echo -e "Installing PNG Library...\n" -cd png - make install -cd .. - -echo -e "\n--------------------------------------------------------------------" -echo -e "Building PNGU Library...\n" -cd pngu - make clean - make all -cd .. - -echo -e "\n--------------------------------------------------------------------" -echo -e "Installing PNGU Library...\n" -cd pngu - make install -cd .. - -# FreeType library -echo -e "\n--------------------------------------------------------------------" -echo -e "Building FreeType Library...\n" -cd freetype - make clean - make all -cd .. - -echo -e "\n--------------------------------------------------------------------" -echo -e "Installing FreeType Library...\n" -cd freetype - make install -cd .. - -# The End -echo -e "\nDone\n" diff --git a/README.html b/README.html index 80387f9..83b68c1 100644 --- a/README.html +++ b/README.html @@ -97,43 +97,51 @@ libz is supplied as source code libfreetype is supplied as source code libfat is supplied with devkitpro (Ie. preinstalled) -Because of the way dependencies work, the libraries must be installed in reverse -order. +The easy way is to install GRRLIB and all the required libraries in a single +command: + c: + cd \grr\trunk\GRRLIB + make clean all install -To install libz *2 +This process may take some time depending on the speed of your PC. + +If you used the method above the following steps are not required, GRRLIB is +installed and you are ready to start developing Wii homebrew games. + +If you want, you could install the libz, libpng, libpngu, libjpeg and +libfreetype libraries in a single command: + c: + cd \grr\trunk\GRRLIB\lib + make clean all install + +Each library could also be installed individually: + +To install libz c: cd \grr\trunk\GRRLIB\lib\zlib make clean all install -To install libpng *2 +To install libpng c: cd \grr\trunk\GRRLIB\lib\png make clean all install -Next up the list is libpngu *2 +To install libpngu c: cd \grr\trunk\GRRLIB\lib\pngu make clean all install -Next up the list is libjpeg *2 +To install libjpeg c: cd \grr\trunk\GRRLIB\lib\jpeg make clean all install -Next up the list is libfreetype *2 +To install libfreetype c: cd \grr\trunk\GRRLIB\lib\freetype make clean all install -*2 A Windows batch-file and a Linux shell-script are included which will - install the libz, libpng, libpngu, libjpeg and libfreetype libraries in a - single command: - c: - cd \grr\trunk\GRRLIB\lib - install <- If you are using Linux, type `./install.sh` instead - -After all five image processing libraries are installed, we can now install -libgrrlib: +To install libgrrlib: c: cd \grr\trunk\GRRLIB\GRRLIB make clean all install