libretro/snes9x2005
1
0
Fork 0
mirror of https://github.com/libretro/snes9x2005.git synced 2025-02-16 23:09:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename LOAD_FROM_MEMORY_TEST to LOAD_FROM_MEMORY

Browse Source
This commit is contained in:
twinaphex 2021-06-04 22:37:50 +02:00
parent 21df2cef5b
commit a17e300a22
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1,6 +1,6 @@
DEBUG = 0
PERF_TEST = 0
LOAD_FROM_MEMORY_TEST = 1
LOAD_FROM_MEMORY = 1
USE_BLARGG_APU ?= 0
LAGFIX = 1
USE_OLD_COLOUR_OPS = 0
@ -211,7 +211,7 @@ else ifeq ($(platform), psp1)
CXX = psp-g++$(EXE_EXT)
AR = psp-ar$(EXE_EXT)
STATIC_LINKING = 1
LOAD_FROM_MEMORY_TEST = 0
LOAD_FROM_MEMORY = 0
FLAGS += -G0
CFLAGS += \
-march=allegrex -mno-abicalls -fno-pic \
@ -226,7 +226,7 @@ else ifeq ($(platform), vita)
CXX = arm-vita-eabi-g++$(EXE_EXT)
AR = arm-vita-eabi-ar$(EXE_EXT)
STATIC_LINKING = 1
LOAD_FROM_MEMORY_TEST = 0
LOAD_FROM_MEMORY = 0
DEFS += -DVITA
STATIC_LINKING := 1
# CTR (3DS)

4
Makefile.common
View File

@ -48,8 +48,8 @@ else
$(CORE_DIR)/spc700.c
endif
ifeq ($(LOAD_FROM_MEMORY_TEST),1)
FLAGS += -DLOAD_FROM_MEMORY_TEST
ifeq ($(LOAD_FROM_MEMORY),1)
FLAGS += -DLOAD_FROM_MEMORY
endif
ifeq ($(USE_OLD_COLOUR_OPS),1)

2
jni/Android.mk
View File

@ -4,7 +4,7 @@ ROOT_DIR := $(LOCAL_PATH)/..
CORE_DIR := $(ROOT_DIR)/source
LIBRETRO_DIR := $(ROOT_DIR)
LOAD_FROM_MEMORY_TEST := 1
LOAD_FROM_MEMORY := 1
FLAGS :=
include $(ROOT_DIR)/Makefile.common

4
libretro.c
View File

@ -711,7 +711,7 @@ unsigned retro_get_region(void)
void retro_get_system_info(struct retro_system_info* info)
{
#ifdef LOAD_FROM_MEMORY_TEST
#ifdef LOAD_FROM_MEMORY
info->need_fullpath = false;
#else
info->need_fullpath = true;
@ -1025,7 +1025,7 @@ bool retro_load_game(const struct retro_game_info* game)
init_descriptors();
check_variables(true);
#ifdef LOAD_FROM_MEMORY_TEST
#ifdef LOAD_FROM_MEMORY
if (!LoadROM(game))
#else
if (!LoadROM(game->path))

7
source/memmap.c
View File

@ -349,8 +349,7 @@ void S9xDeinitMemory(void)
}
}
#ifndef LOAD_FROM_MEMORY_TEST
#ifndef LOAD_FROM_MEMORY
/* Read variable size MSB int from a file */
static int32_t ReadInt(FILE* f, uint32_t nbytes)
{
@ -564,7 +563,7 @@ static uint32_t FileLoader(uint8_t* buffer, const char* filename, int32_t maxsiz
/**********************************************************************************************/
bool LoadROM(
#ifdef LOAD_FROM_MEMORY_TEST
#ifdef LOAD_FROM_MEMORY
const struct retro_game_info* game
#else
const char* filename
@ -589,7 +588,7 @@ bool LoadROM(
retry_count = 0;
again:
#ifdef LOAD_FROM_MEMORY_TEST
#ifdef LOAD_FROM_MEMORY
strncpy(Memory.ROMFilename, game->path, sizeof(Memory.ROMFilename));
Memory.HeaderCount = 0;

2
source/memmap.h
View File

@ -33,7 +33,7 @@
#define BIGFIRST 2
#define SMALLFIRST 3
#ifdef LOAD_FROM_MEMORY_TEST
#ifdef LOAD_FROM_MEMORY
bool LoadROM(const struct retro_game_info* game);
#else
bool LoadROM(const char*);