Skip to content

Commit

Permalink
(Mednafen PCE) Update to 0.9.33.3
Browse files Browse the repository at this point in the history
  • Loading branch information
inactive123 committed Apr 20, 2014
1 parent f23e446 commit c2adc1c
Show file tree
Hide file tree
Showing 53 changed files with 9,832 additions and 88 deletions.
28 changes: 23 additions & 5 deletions Makefile
Expand Up @@ -4,6 +4,7 @@ FRONTEND_SUPPORTS_RGB565 = 1
MEDNAFEN_DIR := mednafen
MEDNAFEN_LIBRETRO_DIR := mednafen-libretro
NEED_TREMOR = 0
LIBRETRO_SOURCES :=

ifeq ($(platform),)
platform = unix
Expand Down Expand Up @@ -71,23 +72,32 @@ else ifeq ($(core), pce-fast)
ifneq ($(platform), osx)
PTHREAD_FLAGS = -pthread
endif
NEED_BPP = 32
HAVE_HES = 0
NEED_BPP = 16
NEED_TREMOR = 1
NEED_BLIP = 1
NEED_CD = 1
NEED_STEREO_SOUND = 1
NEED_SCSI_CD = 1
NEED_THREADING = 1
NEED_CRC32 = 1
WANT_NEW_API = 1
CORE_DEFINE := -DWANT_PCE_FAST_EMU
CORE_DIR := $(MEDNAFEN_DIR)/pce_fast
CORE_DIR := $(MEDNAFEN_DIR)/pce_fast-09333

CORE_SOURCES := $(CORE_DIR)/huc.cpp \
CORE_SOURCES := \
$(CORE_DIR)/huc.cpp \
$(CORE_DIR)/huc6280.cpp \
$(CORE_DIR)/input.cpp \
$(CORE_DIR)/pce.cpp \
$(CORE_DIR)/tsushin.cpp \
$(CORE_DIR)/pcecd.cpp \
$(CORE_DIR)/pcecd_drive.cpp \
$(CORE_DIR)/psg.cpp \
$(CORE_DIR)/vdc.cpp

ifeq ($(HAVE_HES),1)
CORE_SOURCES += $(CORE_DIR)/hes.cpp
endif
TARGET_NAME := mednafen_pce_fast_libretro

arch = intel
Expand Down Expand Up @@ -484,6 +494,7 @@ endif

ifeq ($(NEED_CRC32), 1)
FLAGS += -DWANT_CRC32
LIBRETRO_SOURCES += scrc32.cpp
endif

ifeq ($(NEED_DEINTERLACER), 1)
Expand Down Expand Up @@ -538,7 +549,7 @@ MEDNAFEN_SOURCES := $(MEDNAFEN_DIR)/mednafen.cpp \
$(MEDNAFEN_DIR)/md5.cpp


LIBRETRO_SOURCES := libretro.cpp stubs.cpp $(THREAD_STUBS)
LIBRETRO_SOURCES += libretro.cpp stubs.cpp $(THREAD_STUBS)

TRIO_SOURCES += $(MEDNAFEN_DIR)/trio/trio.c \
$(MEDNAFEN_DIR)/trio/triostr.c
Expand Down Expand Up @@ -589,6 +600,10 @@ ifeq ($(CACHE_CD), 1)
FLAGS += -D__LIBRETRO_CACHE_CD__
endif

ifeq ($(NEED_BPP), 8)
FLAGS += -DWANT_8BPP
endif

ifeq ($(NEED_BPP), 16)
FLAGS += -DWANT_16BPP
endif
Expand All @@ -601,6 +616,9 @@ ifeq ($(NEED_BPP), 32)
FLAGS += -DWANT_32BPP
endif

ifeq ($(WANT_NEW_API), 1)
FLAGS += -DWANT_NEW_API
endif

CXXFLAGS += $(FLAGS)
CFLAGS += $(FLAGS)
Expand Down
2 changes: 1 addition & 1 deletion libretro.cpp
Expand Up @@ -92,7 +92,7 @@ static bool is_pal = false;
#include "mednafen/cdrom/pcecd.h"
#define MEDNAFEN_CORE_NAME_MODULE "pce_fast"
#define MEDNAFEN_CORE_NAME "Mednafen PCE Fast"
#define MEDNAFEN_CORE_VERSION "v0.9.28"
#define MEDNAFEN_CORE_VERSION "v0.9.33.3"
#define MEDNAFEN_CORE_EXTENSIONS "pce|sgx|cue"
#define MEDNAFEN_CORE_TIMING_FPS 59.82
#define MEDNAFEN_CORE_GEOMETRY_BASE_W (game->nominal_width)
Expand Down
4 changes: 4 additions & 0 deletions mednafen/cputest/cputest.h
@@ -0,0 +1,4 @@
#ifndef _MEDNAFEN_CPUTEST_H
#define _MEDNAFEN_CPUTEST_H

#endif
25 changes: 25 additions & 0 deletions mednafen/git.h
Expand Up @@ -104,6 +104,27 @@ typedef struct
const InputPortInfoStruct *Types;
} InputInfoStruct;

struct MemoryPatch;

struct CheatFormatStruct
{
const char *FullName; //"Game Genie", "GameShark", "Pro Action Catplay", etc.
const char *Description; // Whatever?

bool (*DecodeCheat)(const std::string& cheat_string, MemoryPatch* patch); // *patch should be left as initialized by MemoryPatch::MemoryPatch(), unless this is the
// second(or third or whatever) part of a multipart cheat.
//
// Will throw an std::exception(or derivative) on format error.
//
// Will return true if this is part of a multipart cheat.
};

struct CheatFormatInfoStruct
{
unsigned NumFormats;

CheatFormatStruct *Formats;
};

// Miscellaneous system/simple commands(power, reset, dip switch toggles, coin insert, etc.)
// (for DoSimpleCommand() )
Expand Down Expand Up @@ -302,6 +323,10 @@ typedef struct
void (*RemoveReadPatches)(void);
uint8 (*MemRead)(uint32 addr);

#ifdef WANT_NEW_API
CheatFormatInfoStruct *CheatFormatInfo;
#endif

bool SaveStateAltersState; // true for bsnes and some libco-style emulators, false otherwise.
// Main save state routine, called by the save state code in state.cpp.
// When saving, load is set to 0. When loading, load is set to the version field of the save state being loaded.
Expand Down
3 changes: 3 additions & 0 deletions mednafen/mednafen.h
Expand Up @@ -28,6 +28,9 @@ void MDFN_DebugPrintReal(const char *file, const int line, const char *format, .
void MDFN_LoadGameCheats(void *override);
void MDFN_FlushGameCheats(int nosave);

void MDFN_MidSync(EmulateSpecStruct *espec);
void MDFN_MidLineUpdate(EmulateSpecStruct *espec, int y);

#include "mednafen-driver.h"

#include "mednafen-endian.h"
Expand Down
4 changes: 4 additions & 0 deletions mednafen/movie.h
@@ -0,0 +1,4 @@
#ifndef _MEDNAFEN_MOVIE_H
#define _MEDNAFEN_MOVIE_H

#endif
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 8 additions & 0 deletions mednafen/pce_fast-09333/Makefile.am
@@ -0,0 +1,8 @@
AUTOMAKE_OPTIONS = subdir-objects
DEFS = -DLOCALEDIR=\"$(datadir)/locale\" @DEFS@
DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/intl -I$(top_srcdir)/src/hw_misc -I$(top_srcdir)/src/hw_sound

noinst_LIBRARIES = libpce_fast.a
mednafen_SOURCES = huc6280.cpp pce.cpp vdc.cpp input.cpp huc.cpp hes.cpp pcecd.cpp pcecd_drive.cpp psg.cpp

libpce_fast_a_SOURCES = $(mednafen_SOURCES)

0 comments on commit c2adc1c

Please sign in to comment.