ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Libretro: Build fixes for non-GB and coe cleanup

This commit is contained in:
Vicki Pfau 2020-08-28 18:33:31 -07:00
parent be03b7c85f
commit 86fcd145eb
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/platform/libretro/libretro.c
View File

@ -78,6 +78,7 @@ static void _reloadSettings(void) {
}; };
struct retro_variable var; struct retro_variable var;
#ifdef M_CORE_GB
enum GBModel model; enum GBModel model;
const char* modelName; const char* modelName;
@ -101,6 +102,7 @@ static void _reloadSettings(void) {
mCoreConfigSetDefaultValue(&core->config, "sgb.model", modelName); mCoreConfigSetDefaultValue(&core->config, "sgb.model", modelName);
mCoreConfigSetDefaultValue(&core->config, "cgb.model", modelName); mCoreConfigSetDefaultValue(&core->config, "cgb.model", modelName);
} }
#endif
var.key = "mgba_use_bios"; var.key = "mgba_use_bios";
var.value = 0; var.value = 0;
@ -114,21 +116,18 @@ static void _reloadSettings(void) {
opts.skipBios = strcmp(var.value, "ON") == 0; opts.skipBios = strcmp(var.value, "ON") == 0;
} }
#ifdef M_CORE_GB
var.key = "mgba_sgb_borders"; var.key = "mgba_sgb_borders";
var.value = 0; var.value = 0;
if (environCallback(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (environCallback(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {
if (strcmp(var.value, "ON") == 0) { mCoreConfigSetDefaultIntValue(&core->config, "sgb.borders", strcmp(var.value, "ON") == 0);
mCoreConfigSetDefaultIntValue(&core->config, "sgb.borders", true);
} else {
mCoreConfigSetDefaultIntValue(&core->config, "sgb.borders", false);
}
} }
#endif
var.key = "mgba_frameskip"; var.key = "mgba_frameskip";
var.value = 0; var.value = 0;
if (environCallback(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (environCallback(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {
opts.frameskip = strtol(var.value, NULL, 10); opts.frameskip = strtol(var.value, NULL, 10);
} }
var.key = "mgba_idle_optimization"; var.key = "mgba_idle_optimization";
@ -179,7 +178,11 @@ void retro_set_input_state(retro_input_state_t input) {
void retro_get_system_info(struct retro_system_info* info) { void retro_get_system_info(struct retro_system_info* info) {
info->need_fullpath = false; info->need_fullpath = false;
info->valid_extensions = "gba|gb|gbc"; #ifdef M_CORE_GB
info->valid_extensions = "gba|gb|gbc|sgb";
#else
info->valid_extensions = "gba";
#endif
info->library_version = projectVersion; info->library_version = projectVersion;
info->library_name = projectName; info->library_name = projectName;
info->block_extract = false; info->block_extract = false;
@ -287,25 +290,15 @@ void retro_run(void) {
.value = 0 .value = 0
}; };
if (environCallback(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (environCallback(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {
struct GBA* gba = core->board; mCoreConfigSetIntValue(&core->config, "allowOpposingDirections", strcmp(var.value, "yes") == 0);
struct GB* gb = core->board; core->reloadConfigOption(core, "allowOpposingDirections", NULL);
switch (core->platform(core)) {
case PLATFORM_GBA:
gba->allowOpposingDirections = strcmp(var.value, "yes") == 0;
break;
case PLATFORM_GB:
gb->allowOpposingDirections = strcmp(var.value, "yes") == 0;
break;
default:
break;
}
} }
var.key = "mgba_frameskip"; var.key = "mgba_frameskip";
var.value = 0; var.value = 0;
if (environCallback(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (environCallback(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {
mCoreConfigSetUIntValue(&core->config, "frameskip", strtol(var.value, NULL, 10)); mCoreConfigSetIntValue(&core->config, "frameskip", strtol(var.value, NULL, 10));
mCoreLoadConfig(core); core->reloadConfigOption(core, "frameskip", NULL);
} }
} }