Merge branch 'move-camera-location' of https://github.com/libretro/RetroArch into move-camera-location

This commit is contained in:
twinaphex 2021-11-11 17:54:46 +01:00
commit a3aed79b71
2 changed files with 1 additions and 3 deletions

View File

@ -864,6 +864,7 @@ AUDIO RESAMPLER
/*============================================================
CAMERA
============================================================ */
#include "../camera/camera_driver.c"
#if defined(ANDROID)
#include "../camera/drivers/android.c"
#elif defined(EMSCRIPTEN)

View File

@ -7340,7 +7340,6 @@ static core_option_manager_t *runloop_init_core_variables(
bool runloop_environment_cb(unsigned cmd, void *data)
{
unsigned p;
struct rarch_state *p_rarch = &rarch_st;
runloop_state_t *runloop_st = &runloop_state;
recording_state_t *recording_st = recording_state_get_ptr();
@ -9610,8 +9609,6 @@ bool libretro_get_shared_context(void)
static void uninit_libretro_symbols(
struct retro_core_t *current_core)
{
struct rarch_state
*p_rarch = &rarch_st;
runloop_state_t
*runloop_st = &runloop_state;
input_driver_state_t