start cleaning up.

This commit is contained in:
aliaspider 2014-11-19 20:10:23 +01:00
parent 00cf57887f
commit 297b2151f3
4 changed files with 15 additions and 74 deletions

View File

@ -2,7 +2,6 @@ DEBUG = 0
FRONTEND_SUPPORTS_RGB565 = 1
MEDNAFEN_DIR := mednafen
NEED_TREMOR = 0
LIBRETRO_SOURCES :=
ifeq ($(platform),)
@ -20,23 +19,12 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),)
endif
endif
# If you have a system with 1GB RAM or more - cache the whole
# CD for CD-based systems in order to prevent file access delays/hiccups
CACHE_CD = 0
ifneq ($(platform), osx)
PTHREAD_FLAGS = -pthread
endif
HAVE_HES = 0
NEED_BPP = 32
NEED_TREMOR = 1
NEED_BLIP = 1
NEED_CD = 1
NEED_THREADING = 1
NEED_CRC32 = 1
WANT_NEW_API = 1
CORE_DEFINE := -DWANT_PCE_FAST_EMU -DWANT_STEREO_SOUND
CORE_DIR := $(MEDNAFEN_DIR)/pce_fast
CORE_DEFINE := -DWANT_PCE_FAST_EMU -DWANT_STEREO_SOUND
CORE_DIR := $(MEDNAFEN_DIR)/pce_fast
CORE_SOURCES := $(CORE_DIR)/huc6280.cpp \
$(CORE_DIR)/input.cpp \
@ -45,9 +33,6 @@ CORE_SOURCES := $(CORE_DIR)/huc6280.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
@ -58,9 +43,9 @@ endif
HW_MISC_SOURCES += $(MEDNAFEN_DIR)/hw_misc/arcade_card/arcade_card.cpp
OKIADPCM_SOURCES += $(MEDNAFEN_DIR)/okiadpcm.cpp
ifeq ($(NEED_BLIP), 1)
RESAMPLER_SOURCES += $(MEDNAFEN_DIR)/sound/Blip_Buffer.cpp
endif
CORE_INCDIR := -I$(CORE_DIR)
@ -237,17 +222,15 @@ else
FLAGS += -DHAVE__MKDIR
endif
ifeq ($(NEED_THREADING), 1)
FLAGS += -DWANT_THREADING
THREAD_SOURCES += thread.c
endif
ifeq ($(NEED_CRC32), 1)
FLAGS += -DWANT_CRC32
LIBRETRO_SOURCES += scrc32.cpp
endif
ifeq ($(NEED_CD), 1)
CDROM_SOURCES += $(MEDNAFEN_DIR)/cdrom/CDAccess.cpp \
$(MEDNAFEN_DIR)/cdrom/CDAccess_Image.cpp \
$(MEDNAFEN_DIR)/cdrom/CDAccess_CCD.cpp \
@ -260,13 +243,11 @@ CDROM_SOURCES += $(MEDNAFEN_DIR)/cdrom/CDAccess.cpp \
$(MEDNAFEN_DIR)/cdrom/l-ec.cpp \
$(MEDNAFEN_DIR)/cdrom/crc32.cpp \
$(MEDNAFEN_DIR)/cdrom/cdromif.cpp
FLAGS += -DNEED_CD
endif
FLAGS += -DNEED_CD
ifeq ($(NEED_TREMOR), 1)
TREMOR_SRC := $(wildcard $(MEDNAFEN_DIR)/tremor/*.c)
FLAGS += -DNEED_TREMOR
endif
TREMOR_SRC := $(wildcard $(MEDNAFEN_DIR)/tremor/*.c)
FLAGS += -DNEED_TREMOR
MEDNAFEN_SOURCES := $(MEDNAFEN_DIR)/error.cpp \
@ -334,22 +315,10 @@ ifeq ($(IS_X86), 1)
FLAGS += -DARCH_X86
endif
ifeq ($(CACHE_CD), 1)
FLAGS += -D__LIBRETRO_CACHE_CD__
endif
ifeq ($(NEED_BPP), 16)
FLAGS += -DWANT_16BPP
endif
ifeq ($(FRONTEND_SUPPORTS_RGB565), 1)
FLAGS += -DFRONTEND_SUPPORTS_RGB565
endif
ifeq ($(WANT_NEW_API), 1)
FLAGS += -DWANT_NEW_API
endif
CXXFLAGS += $(FLAGS)
CFLAGS += $(FLAGS)

View File

@ -459,8 +459,8 @@ static void Emulate(EmulateSpecStruct *espec)
retro_perf_tick_t start_ticks = VDC_RunFrame_time.total;
#endif
PSPPROF_START;
if (VDC_RunFrame_time.call_cnt == 44)
printf("baaaad");
// if (VDC_RunFrame_time.call_cnt == 44)
// printf("halt\n");
VDC_RunFrame(espec, false);
PSPPROF_STOP;
RETRO_PERFORMANCE_STOP(VDC_RunFrame_time);
@ -951,7 +951,6 @@ MDFNGI EmulatedPCE_Fast =
NULL,
NULL,
MemRead,
NULL,
false,
StateAction,
Emulate,

View File

@ -106,26 +106,6 @@ typedef struct
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() )
enum
@ -323,10 +303,6 @@ 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.

View File

@ -31,11 +31,8 @@ MDFN_PixelFormat::MDFN_PixelFormat()
MDFN_PixelFormat::MDFN_PixelFormat(const unsigned int p_colorspace, const uint8 p_rs, const uint8 p_gs, const uint8 p_bs, const uint8 p_as)
{
#if defined(WANT_16BPP)
bpp = 16;
#else
bpp = 32;
#endif
colorspace = p_colorspace;
Rshift = p_rs;