mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 09:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Start getting rid of hardcoded core\. references

Browse Source
This commit is contained in:
twinaphex 2016-01-28 03:41:30 +01:00
parent 6e3041e33c
commit eb503e0464
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command_event.c
View File

@ -578,7 +578,7 @@ static bool event_init_core(void *data)
if (!core_type) if (!core_type)
return false; return false;
init_libretro_sym(*core_type); init_libretro_sym(*core_type, &core);
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_INIT, NULL); runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_INIT, NULL);
/* auto overrides: apply overrides */ /* auto overrides: apply overrides */

20
dynamic.c
View File

@ -50,23 +50,21 @@
#ifdef HAVE_DYNAMIC #ifdef HAVE_DYNAMIC
#define SYMBOL(x) do { \ #define SYMBOL(x) do { \
function_t func = dylib_proc(lib_handle, #x); \ function_t func = dylib_proc(lib_handle, #x); \
memcpy(&core.x, &func, sizeof(func)); \ memcpy(&current_core->x, &func, sizeof(func)); \
if (core.x == NULL) { RARCH_ERR("Failed to load symbol: \"%s\"\n", #x); retro_fail(1, "init_libretro_sym()"); } \ if (current_core->x == NULL) { RARCH_ERR("Failed to load symbol: \"%s\"\n", #x); retro_fail(1, "init_libretro_sym()"); } \
} while (0) } while (0)
static dylib_t lib_handle; static dylib_t lib_handle;
#else #else
#define SYMBOL(x) core.x = x #define SYMBOL(x) current_core->x = x
#endif #endif
#define SYMBOL_DUMMY(x) core.x = libretro_dummy_##x #define SYMBOL_DUMMY(x) current_core->x = libretro_dummy_##x
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
#define SYMBOL_FFMPEG(x) core.x = libretro_ffmpeg_##x #define SYMBOL_FFMPEG(x) current_core->x = libretro_ffmpeg_##x
#endif #endif
#ifdef HAVE_IMAGEVIEWER #ifdef HAVE_IMAGEVIEWER
#define SYMBOL_IMAGEVIEWER(x) core.x = libretro_imageviewer_##x #define SYMBOL_IMAGEVIEWER(x) current_core->x = libretro_imageviewer_##x
#endif #endif
struct retro_core_t core; struct retro_core_t core;
@ -308,7 +306,7 @@ static void load_dynamic_core(void)
* *
* Setup libretro callback symbols. * Setup libretro callback symbols.
**/ **/
static void load_symbols(enum rarch_core_type type) static void load_symbols(enum rarch_core_type type, struct retro_core_t *current_core)
{ {
switch (type) switch (type)
{ {
@ -512,13 +510,13 @@ void libretro_get_current_core_pathname(char *name, size_t size)
* Initializes libretro symbols and * Initializes libretro symbols and
* setups environment callback functions. * setups environment callback functions.
**/ **/
void init_libretro_sym(enum rarch_core_type type) void init_libretro_sym(enum rarch_core_type type, struct retro_core_t *current_core)
{ {
/* Guarantee that we can do "dirty" casting. /* Guarantee that we can do "dirty" casting.
* Every OS that this program supports should pass this. */ * Every OS that this program supports should pass this. */
retro_assert(sizeof(void*) == sizeof(void (*)(void))); retro_assert(sizeof(void*) == sizeof(void (*)(void)));
load_symbols(type); load_symbols(type, current_core);
} }
/** /**

2
dynamic.h
View File

@ -162,7 +162,7 @@ extern struct retro_core_t core;
* Initializes libretro symbols and * Initializes libretro symbols and
* setups environment callback functions. * setups environment callback functions.
**/ **/
void init_libretro_sym(enum rarch_core_type type); void init_libretro_sym(enum rarch_core_type type, struct retro_core_t *core);
/** /**
* uninit_libretro_sym: * uninit_libretro_sym: