libretro/mgba
1
0
Fork 0
mirror of https://github.com/libretro/mgba.git synced 2024-11-23 07:59:46 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Libretro: Fix root issue for config crash

Browse Source
This commit is contained in:
Vicki Pfau 2018-10-01 10:35:28 -07:00
parent 85c1cf5bca
commit 0b02b19e9c
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.libretro
View File

@ -264,9 +264,9 @@ else ifeq ($(platform), libnx)
STATIC_LINKING_LINK=1 STATIC_LINKING_LINK=1
HAVE_VFS_FD = 0 HAVE_VFS_FD = 0
CFLAGS += -O3 -fomit-frame-pointer -ffast-math -I$(LIBNX)/include/ -fPIE -Wl,--allow-multiple-definition -specs=$(LIBNX)/switch.specs CFLAGS += -O3 -fomit-frame-pointer -ffast-math -I$(LIBNX)/include/ -fPIE -Wl,--allow-multiple-definition -specs=$(LIBNX)/switch.specs
DEFINES += -std=c99 DEFINES += -std=gnu11
ASFLAGS += -DHAVE_LIBNX ASFLAGS += -DHAVE_LIBNX
PLATFORM_DEFINES += -D__SWITCH__ -DHAVE_LIBNX PLATFORM_DEFINES += -D__SWITCH__ -DHAVE_LIBNX -DHAVE_LOCALE
PLATFORM_DEFINES += -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE -mcpu=cortex-a57+crc+fp+simd -DHAVE_INTTYPES -DLSB_FIRST -DINLINE=inline PLATFORM_DEFINES += -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE -mcpu=cortex-a57+crc+fp+simd -DHAVE_INTTYPES -DLSB_FIRST -DINLINE=inline
# Nintendo Switch (libtransistor) # Nintendo Switch (libtransistor)

4
src/core/config.c
View File

@ -325,10 +325,6 @@ void mCoreConfigCopyValue(struct mCoreConfig* config, const struct mCoreConfig*
} }
void mCoreConfigMap(const struct mCoreConfig* config, struct mCoreOptions* opts) { void mCoreConfigMap(const struct mCoreConfig* config, struct mCoreOptions* opts) {
#ifdef HAVE_LIBNX // Needed or fatal
return;
#endif
_lookupCharValue(config, "bios", &opts->bios); _lookupCharValue(config, "bios", &opts->bios);
_lookupCharValue(config, "shader", &opts->shader); _lookupCharValue(config, "shader", &opts->shader);
_lookupIntValue(config, "logLevel", &opts->logLevel); _lookupIntValue(config, "logLevel", &opts->logLevel);

2
src/core/core.c
View File

@ -294,9 +294,7 @@ void mCoreLoadForeignConfig(struct mCore* core, const struct mCoreConfig* config
mCoreConfigCopyValue(&core->config, config, "cheatAutosave"); mCoreConfigCopyValue(&core->config, config, "cheatAutosave");
mCoreConfigCopyValue(&core->config, config, "cheatAutoload"); mCoreConfigCopyValue(&core->config, config, "cheatAutoload");
#ifndef HAVE_LIBNX // Needed or fatal
core->loadConfig(core, config); core->loadConfig(core, config);
#endif
} }
void mCoreSetRTC(struct mCore* core, struct mRTCSource* rtc) { void mCoreSetRTC(struct mCore* core, struct mRTCSource* rtc) {