libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(RARCH_CONSOLE) Build fix for now - dummy loading sidestepped

Browse Source 
for now until solution arrives
This commit is contained in:
twinaphex 2013-04-14 17:15:57 +02:00
parent c9a02273bb
commit 250b52c130
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/rsound.c
View File

@ -37,7 +37,7 @@ typedef struct rsd
scond_t *cond;
} rsd_t;
static ssize_t audio_cb(void *data, size_t bytes, void *userdata)
static ssize_t rsound_audio_cb(void *data, size_t bytes, void *userdata)
{
rsd_t *rsd = (rsd_t*)userdata;
@ -87,7 +87,7 @@ static void *rs_init(const char *device, unsigned rate, unsigned latency)
rsd_set_param(rd, RSD_FORMAT, &format);
rsd_set_callback(rd, audio_cb, err_cb, 256, rsd);
rsd_set_callback(rd, rsound_audio_cb, err_cb, 256, rsd);
if (rsd_start(rd) < 0)
{

6
dynamic.c
View File

@ -326,14 +326,18 @@ void libretro_get_current_core_pathname(char *name, size_t size)
void init_libretro_sym(bool dummy)
{
#ifndef RARCH_CONSOLE
lib_dummy = dummy;
#endif
// Guarantee that we can do "dirty" casting.
// Every OS that this program supports should pass this ...
rarch_assert(sizeof(void*) == sizeof(void (*)(void)));
#ifndef RARCH_CONSOLE
if (lib_dummy)
load_symbols_dummy();
else
#endif
{
#ifdef HAVE_DYNAMIC
// Try to verify that -lretro was not linked in from other modules
@ -367,7 +371,9 @@ void uninit_libretro_sym(void)
dylib_close(lib_handle);
lib_handle = NULL;
#endif
#ifndef RARCH_CONSOLE
lib_dummy = false;
#endif
}
#ifdef NEED_DYNAMIC

6
frontend/frontend_console.c
View File

@ -116,7 +116,8 @@ int rarch_main(int argc, char *argv[])
get_environment_settings(argc, argv);
config_load();
init_libretro_sym();
/* FIXME - when dummy loading becomes possible perhaps change this param */
init_libretro_sym(false);
rarch_init_system_info();
global_init_drivers();
@ -136,7 +137,8 @@ int rarch_main(int argc, char *argv[])
config_save_file(g_extern.config_path);
#endif
init_libretro_sym();
/* FIXME - when dummy loading becomes possible perhaps change this param */
init_libretro_sym(false);
system_post_init();