From be4a01db54dab093140bac3edbbf4dab3070156e Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 6 Aug 2015 11:39:49 +0200
Subject: [PATCH] Revert "Add non-Griffin codepath"

This reverts commit ec7e16ff84214b8e253f5ae5b9d29636a3dabc39.
---
 Makefile.common                | 33 +--------------------------------
 Makefile.libretro              |  3 ---
 src/drivers/libretro/griffin.c |  9 +++++++++
 3 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index f4e545c..e9416cc 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -2,35 +2,4 @@ INCFLAGS := -I$(CORE_DIR)/drivers/libretro -I$(CORE_DIR) -I$(CORE_DIR)/input -I$
 
 FCEU_SRC_DIRS := $(CORE_DIR)/boards $(CORE_DIR)/input $(CORE_DIR)/mappers
 SOURCES_C := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.c))
-SOURCES_C += $(CORE_DIR)/drivers/libretro/fceu/ines.c $(CORE_DIR)/drivers/libretro/fceu/unif.c $(CORE_DIR)/x6502.c
-
-ifeq ($(WANT_GRIFFIN),1)
-SOURCES_C += \
-				 $(CORE_DIR)/drivers/libretro/griffin.c
-else
-SOURCES_C += \
-				 $(CORE_DIR)/drivers/libretro/libretro.c \
-				 $(CORE_DIR)/drivers/libretro/memstream.c \
-				 $(CORE_DIR)/drivers/libretro/crc32-zlib.c \
-				 $(CORE_DIR)/cart.c \
-				 $(CORE_DIR)/cheat.c \
-				 $(CORE_DIR)/crc32.c \
-				 $(CORE_DIR)/debug.c \
-				 $(CORE_DIR)/drivers/libretro/fceu/fceu-endian.c \
-				 $(CORE_DIR)/drivers/libretro/fceu/fceu-memory.c \
-				 $(CORE_DIR)/drivers/libretro/fceu/misc.c \
-				 $(CORE_DIR)/drivers/libretro/fceu/fceu.c \
-				 $(CORE_DIR)/drivers/libretro/fceu/fds.c \
-				 $(CORE_DIR)/drivers/libretro/fceu/file.c \
-				 $(CORE_DIR)/filter.c \
-				 $(CORE_DIR)/drivers/libretro/fceu/general.c \
-				 $(CORE_DIR)/drivers/libretro/fceu/input.c \
-				 $(CORE_DIR)/drivers/libretro/fceu/nsf.c \
-				 $(CORE_DIR)/md5.c \
-				 $(CORE_DIR)/palette.c \
-				 $(CORE_DIR)/ppu.c \
-				 $(CORE_DIR)/sound.c \
-				 $(CORE_DIR)/vsuni.c \
-				 $(CORE_DIR)/drivers/libretro/fceu/state.c \
-				 $(CORE_DIR)/drivers/libretro/fceu/video.c
-endif
+SOURCES_C += $(CORE_DIR)/drivers/libretro/griffin.c $(CORE_DIR)/drivers/libretro/fceu/ines.c $(CORE_DIR)/drivers/libretro/fceu/unif.c $(CORE_DIR)/x6502.c
diff --git a/Makefile.libretro b/Makefile.libretro
index 082ca2e..8dc91d2 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -1,6 +1,5 @@
 DEBUG = 0
 EXTERNAL_ZLIB = 0
-WANT_GRIFFIN = 0
 
 ifeq ($(platform),)
 	platform = unix
@@ -229,9 +228,7 @@ CORE_DIR := src
 
 include Makefile.common
 
-ifeq ($(WANT_GRIFFIN),1)
 CFLAGS += -DWANT_GRIFFIN
-endif
 
 OBJECTS := $(SOURCES_C:.c=.o)
 
diff --git a/src/drivers/libretro/griffin.c b/src/drivers/libretro/griffin.c
index d910141..105769e 100644
--- a/src/drivers/libretro/griffin.c
+++ b/src/drivers/libretro/griffin.c
@@ -12,12 +12,15 @@
 #include "drivers/libretro/fceu/fceu-memory.c"
 #include "drivers/libretro/fceu/misc.c"
 #include "drivers/libretro/fceu/fceu.c"
+//#include "fceustr.c"
 #include "drivers/libretro/fceu/fds.c"
 #include "drivers/libretro/fceu/file.c"
 #include "filter.c"
 #include "drivers/libretro/fceu/general.c"
 #include "drivers/libretro/fceu/input.c"
 #include "md5.c"
+//#include "movie.c"
+//#include "netplay.c"
 #include "drivers/libretro/fceu/nsf.c"
 #include "palette.c"
 #include "ppu.c"
@@ -25,5 +28,11 @@
 #include "drivers/libretro/fceu/state.c"
 #include "drivers/libretro/fceu/video.c"
 #include "vsuni.c"
+//#include "wave.c"
+
+
+//#include "x6502.c"
+//#include "ines.c"
+//#include "unif.c"
 
 #endif