From d97465d16d12506ec74ac8aca053fd009f596c66 Mon Sep 17 00:00:00 2001
From: Twinaphex <autechre1024@hotmail.com>
Date: Tue, 26 Jun 2012 18:58:41 +0200
Subject: [PATCH] (Wii) Removed freetype dependency

---
 Makefile.wii     | 14 ++++++++------
 wii/pkg/meta.xml |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile.wii b/Makefile.wii
index c6a6c38ae5..0512da41a0 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -14,8 +14,6 @@ CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc
 CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++
 LD = $(DEVKITPPC)/bin/powerpc-eabi-ld
 
-FREETYPECONFIG = $(DEVKITPRO)/portlibs/ppc/bin/freetype-config
-
 DOL_TARGET := retroarch.dol
 ELF_TARGET := retroarch.elf
 
@@ -23,15 +21,16 @@ INCLUDE := -I. -I$(DEVKITPRO)/libogc/include
 LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
 
 MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
-CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE) $(shell $(FREETYPECONFIG) --cflags)
-CXXFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE) $(shell $(FREETYPECONFIG) --cflags)
-LDFLAGS := $(MACHDEP) $(shell $(FREETYPECONFIG) --libs)
+CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
+CXXFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
+LDFLAGS := $(MACHDEP)
 LIBS := -lfat -lretro -lwiiuse -logc -lbte
 
 OBJ = console/griffin/griffin.o console/font.bmpobj console/rzlib/rzlib.o
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
+CFLAGS          += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
 OBJ += console/logger/logger.o
 endif
 
@@ -39,7 +38,7 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
 endif
 
-CFLAGS += -std=gnu99 -DHAVE_DEFAULT_RETROPAD_INPUT -DRARCH_CONSOLE -DHAVE_CONFIGFILE=1 -DGEKKO -DHW_RVL -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_FREETYPE -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"0.9.6\" -Dmain=rarch_main -Wno-char-subscripts -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
+CFLAGS += -std=gnu99 -DHAVE_DEFAULT_RETROPAD_INPUT -DRARCH_CONSOLE -DHAVE_CONFIGFILE=1 -DGEKKO -DHW_RVL -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"0.9.6\" -Dmain=rarch_main -Wno-char-subscripts 
 
 ifeq ($(DEBUG), 1)
    CFLAGS += -O0 -g
@@ -63,6 +62,9 @@ $(ELF_TARGET): $(OBJ)
 %.bmpobj: %.bmp
 	$(LD) -r -b binary -o $@ $<
 
+pkg: all
+	cp -r $(DOL_TARGET) wii/pkg/boot.dol
+
 clean:
 	rm -f $(DOL_TARGET)
 	rm -f $(ELF_TARGET)
diff --git a/wii/pkg/meta.xml b/wii/pkg/meta.xml
index 6eb3513ed2..9ccfc75bca 100644
--- a/wii/pkg/meta.xml
+++ b/wii/pkg/meta.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <app version="1">
   <name>RetroArch Wii</name>
-  <coder>Themaister, Squarepusher2</coder>
+  <coder>Themaister, Squarepusher2, ToadKing</coder>
   <version>0.9.6</version>
   <release_date>2012</release_date>
   <short_description>Multi-system emulator</short_description>