diff --git a/Makefile.gc b/Makefile.gc
index d5ed8ef..64047d5 100644
--- a/Makefile.gc
+++ b/Makefile.gc
@@ -24,18 +24,19 @@ INCLUDES 	:=  source/vba source/vba/gb source/ngc
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
-MACHDEP	= -DGEKKO -mcpu=750 -meabi -mhard-float 
-CFLAGS  = -g -Os -Wall $(MACHDEP) $(INCLUDE) -meabi \
-	  -DNGC -DWORDS_BIGENDIAN -DPACKAGE=\"VisualBoyAdvance\" \
-	  -DVERSION=\"1.7.2\" -DC_CORE \
-	  -DCHANFFS -DSDL -DNO_DEFLATE
-CXXFLAGS	=	$(CFLAGS)
-LDFLAGS	=	$(MACHDEP) -mrvl -Wl,-Map,$(notdir $@).map -Wl,--cref
+
+CFLAGS  = 	-g -Os -Wall $(MACHDEP) $(INCLUDE) \
+			-mcpu=750 -mhard-float -meabi \
+	  		-DNGC -DWORDS_BIGENDIAN -DPACKAGE=\"VisualBoyAdvance\" \
+	  		-DVERSION=\"1.7.2\" -DC_CORE \
+	  		-DCHANFFS -DSDL -DNO_DEFLATE
+CXXFLAGS	= -save-temps -Xassembler -aln=$@.lst $(CFLAGS)
+LDFLAGS		= -g $(MACHDEP) -Wl,-Map,$(notdir $@).map -Wl,--cref
 
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with
 #---------------------------------------------------------------------------------
-LIBS	:=	-lm -lz -lfat -ldb -logc
+LIBS	:=	-lmxml -lbba -ltinysmb -lfat -lz -logc -lm -lfreetype
 
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
diff --git a/Makefile.wii b/Makefile.wii
index b99897c..8718059 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -24,18 +24,19 @@ INCLUDES 	:=  source/vba source/vba/gb source/ngc
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
-MACHDEP	= -DGEKKO -mcpu=750 -meabi -mhard-float 
-CFLAGS  = -g -Os -Wall $(MACHDEP) $(INCLUDE) -meabi \
-	  -DNGC -DWORDS_BIGENDIAN -DPACKAGE=\"VisualBoyAdvance\" \
-	  -DVERSION=\"1.7.2\" -DC_CORE \
-	  -DCHANFFS -DSDL -DWII_BUILD -DNO_DEFLATE
-CXXFLAGS	=	$(CFLAGS)
-LDFLAGS	=	$(MACHDEP) -mrvl -Wl,-Map,$(notdir $@).map -Wl,--cref
+
+CFLAGS  = 	-g -Os -Wall $(MACHDEP) $(INCLUDE) \
+			-mcpu=750 -mhard-float -meabi \
+	  		-DNGC -DWORDS_BIGENDIAN -DPACKAGE=\"VisualBoyAdvance\" \
+	  		-DVERSION=\"1.7.2\" -DC_CORE \
+	  		-DCHANFFS -DSDL -DWII_BUILD -DNO_DEFLATE
+CXXFLAGS	= -save-temps -Xassembler -aln=$@.lst $(CFLAGS)
+LDFLAGS		= -g $(MACHDEP) -Wl,-Map,$(notdir $@).map -Wl,--cref
 
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with
 #---------------------------------------------------------------------------------
-LIBS	:=	-lm -lz -lfat -ldb -lwiiuse -lbte -logc
+LIBS	:=	-ldi -lmxml -lfat -lwiiuse -lz -lbte -logc -lm -lfreetype -ltinysmb
 
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing