From 3e0b04cb7a2519f37524e056cbf9d93f2ba2178e Mon Sep 17 00:00:00 2001 From: aliaspider Date: Thu, 3 Apr 2014 02:34:39 +0100 Subject: [PATCH] build fix when using WANT_GRIFFIN makefile option --- Makefile.libretro | 2 +- src/drivers/libretro/griffin.c | 27 ++++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Makefile.libretro b/Makefile.libretro index 621f664..5d24a60 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -156,7 +156,7 @@ ifeq ($(WANT_GRIFFIN), 1) CFLAGS += -DWANT_GRIFFIN FCEU_SRC_DIRS := $(FCEU_DIR)/boards $(FCEU_DIR)/input $(FCEU_DIR)/mappers $(ZLIB_DIR) FCEU_CSRCS := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.c)) - FCEU_CSRCS += $(LIBRETRO_DIR)/griffin.c $(FCEU_DIR)/ines.c $(FCEU_DIR)/unif.c + FCEU_CSRCS += $(LIBRETRO_DIR)/griffin.c $(FCEU_DIR)/ines.c $(FCEU_DIR)/unif.c $(FCEU_DIR)/x6502.c else FCEU_SRC_DIRS := $(LIBRETRO_DIR) $(FCEU_DIR) $(FCEU_DIR)/boards $(FCEU_DIR)/input $(FCEU_DIR)/mappers $(ZLIB_DIR) FCEU_CSRCS := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.c)) diff --git a/src/drivers/libretro/griffin.c b/src/drivers/libretro/griffin.c index 669c98c..5423993 100644 --- a/src/drivers/libretro/griffin.c +++ b/src/drivers/libretro/griffin.c @@ -4,31 +4,32 @@ #include "drivers/libretro/memstream.c" #include "cart.c" -#include "crc32.c" -#include "fceu.c" -#include "fceustr.c" -#include "file.c" -#include "general.c" -#include "md5.c" -#include "movie.c" -#include "nsf.c" -#include "ppu.c" -#include "vsuni.c" -#include "x6502.c" #include "cheat.c" +#include "crc32.c" #include "debug.c" #include "fceu-endian.c" +#include "fceu-memory.c" +#include "fceu.c" +#include "fceustr.c" #include "fds.c" +#include "file.c" #include "filter.c" +#include "general.c" #include "input.c" -#include "memory.c" +#include "md5.c" +#include "movie.c" #include "netplay.c" +#include "nsf.c" #include "palette.c" +#include "ppu.c" +#include "sound.c" #include "state.c" #include "video.c" +#include "vsuni.c" #include "wave.c" -#include "sound.c" + +//#include "x6502.c" //#include "ines.c" //#include "unif.c"