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

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

diff --git a/Makefile.common b/Makefile.common
index e9416cc..f4e545c 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -2,4 +2,35 @@ 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/griffin.c $(CORE_DIR)/drivers/libretro/fceu/ines.c $(CORE_DIR)/drivers/libretro/fceu/unif.c $(CORE_DIR)/x6502.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
diff --git a/Makefile.libretro b/Makefile.libretro
index 8dc91d2..082ca2e 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -1,5 +1,6 @@
 DEBUG = 0
 EXTERNAL_ZLIB = 0
+WANT_GRIFFIN = 0
 
 ifeq ($(platform),)
 	platform = unix
@@ -228,7 +229,9 @@ 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 105769e..d910141 100644
--- a/src/drivers/libretro/griffin.c
+++ b/src/drivers/libretro/griffin.c
@@ -12,15 +12,12 @@
 #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"
@@ -28,11 +25,5 @@
 #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