admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add non-Griffin codepath"

Browse Source 
This reverts commit ec7e16ff84.
This commit is contained in:
twinaphex
2015-08-06 11:39:49 +02:00
parent e982bb637b
commit be4a01db54
3 changed files with 10 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Makefile.common
View File

@@ -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

3
Makefile.libretro
View File

@@ -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)

9
src/drivers/libretro/griffin.c
View File

@@ -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