From 0d402630dbe163c3f45e4d22dbf8df449aac4a70 Mon Sep 17 00:00:00 2001
From: dborth <dborth@0aaa047c-bd49-0410-9b25-49477284f1fd>
Date: Mon, 26 Jan 2009 09:35:26 +0000
Subject: [PATCH] update makefiles

---
 Makefile.gc            | 5 ++---
 Makefile.wii           | 5 ++---
 source/ngc/fceuram.cpp | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Makefile.gc b/Makefile.gc
index f4c47c6..02e5467 100644
--- a/Makefile.gc
+++ b/Makefile.gc
@@ -18,8 +18,7 @@ include $(DEVKITPPC)/gamecube_rules
 TARGET		:=	fceugx_gc
 TARGETDIR   :=  executables
 BUILD		:=	build_gc
-SOURCES		:=	source/fceultra source/fceultra/boards \
-				source/fceultra/drivers/common source/fceultra/input \
+SOURCES		:=	source/fceultra source/fceultra/boards source/fceultra/input \
 				source/fceultra/mappers source/fceultra/mbshare \
 				source/ngc source/sz source/unzip
 INCLUDES	:=	source/fceultra source/ngc source/unzip
@@ -28,7 +27,7 @@ INCLUDES	:=	source/fceultra source/ngc source/unzip
 # options for code generation
 #---------------------------------------------------------------------------------
 CFLAGS  = -g -O3 -Wall $(MACHDEP) $(INCLUDE) -DNGC \
-		-DHAVE_ASPRINTF -DSTDC -DFCEU_VERSION_NUMERIC=9812 -DFRAMESKIP \
+		-DFCEU_VERSION_NUMERIC=9812 -DFRAMESKIP \
 	    -D_SZ_ONE_DIRECTORY -D_LZMA_IN_CB -D_LZMA_OUT_READ \
 	    -DLANG_$(LANG)
 CXXFLAGS	=	$(CFLAGS)
diff --git a/Makefile.wii b/Makefile.wii
index c2ecb7d..b732eb4 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -18,8 +18,7 @@ include $(DEVKITPPC)/wii_rules
 TARGET		:=	fceugx_wii
 TARGETDIR   :=  executables
 BUILD		:=	build_wii
-SOURCES		:=	source/fceultra source/fceultra/boards \
-				source/fceultra/drivers/common source/fceultra/input \
+SOURCES		:=	source/fceultra source/fceultra/boards source/fceultra/input \
 				source/fceultra/mappers source/fceultra/mbshare \
 				source/ngc source/sz source/unzip
 INCLUDES	:=	source/fceultra source/ngc source/unzip
@@ -28,7 +27,7 @@ INCLUDES	:=	source/fceultra source/ngc source/unzip
 # options for code generation
 #---------------------------------------------------------------------------------
 CFLAGS  = -g -O3 -Wall $(MACHDEP) $(INCLUDE) -DNGC -DWII_DVD \
-		-DHAVE_ASPRINTF -DSTDC -DFCEU_VERSION_NUMERIC=9812 -DFRAMESKIP \
+		-DFCEU_VERSION_NUMERIC=9812 -DFRAMESKIP \
 	    -D_SZ_ONE_DIRECTORY -D_LZMA_IN_CB -D_LZMA_OUT_READ \
 	    -DLANG_$(LANG)
 CXXFLAGS	=	$(CFLAGS)
diff --git a/source/ngc/fceuram.cpp b/source/ngc/fceuram.cpp
index a55ca2b..daf1ca8 100644
--- a/source/ngc/fceuram.cpp
+++ b/source/ngc/fceuram.cpp
@@ -33,7 +33,6 @@ extern "C" {
 #include "fceu.h"
 #include "ppu.h"
 #include "cart.h"
-#include "memory.h"
 #include "x6502.h"
 #include "general.h"
 extern u32 iNESGameCRC32;