Merge remote-tracking branch 'refs/remotes/libretro/master'

.travis.yml

@@ -0,0 +1,37 @@
+# Use 'generic' to be able to override CC/CXX for clang
+language: generic
+
+matrix:
+  include:
+    - compiler: gcc
+    - compiler: clang
+      addons:
+        # Install a more recent clang than the default
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.8
+          packages:
+            - clang-3.8
+      env: COMPILER_NAME=clang-3.8 CXX=clang++-3.8 CC=clang-3.8
+    - os: osx
+      osx_image: xcode7.3
+      script:
+          - xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch.xcodeproj
+
+script:
+  - ./configure
+  - make
+
+addons:
+  apt:
+    packages:
+      - curl
+      - pkg-config
+      - libglu1-mesa-dev
+      - freeglut3-mesa
+      - mesa-common-dev
+      - libsdl1.2-dev
+      - libsdl-image1.2-dev
+      - libsdl-mixer1.2-dev
+      - libsdl-ttf2.0-dev

Makefile.griffin

@@ -408,7 +408,7 @@ ifneq ($(DEBUG), 1)
 	arm-vita-eabi-strip -g $<
 endif
 	vita-elf-create $< $@
-	vita-make-fself $@ eboot.bin
+	vita-make-fself -s $@ eboot.bin
 
 %.elf32: %.elf
 ifeq ($(platform), xenon360)

README.md

@@ -1,3 +1,9 @@
+[![Build Status](https://travis-ci.org/libretro/RetroArch.svg?branch=master)](https://travis-ci.org/libretro/RetroArch)
+<a href="https://scan.coverity.com/projects/retroarch">
+  <img alt="Coverity Scan Build Status"
+       src="https://scan.coverity.com/projects/8936/badge.svg"/>
+</a>
+
 # RetroArch
 
 RetroArch is the reference frontend for the libretro API.

cheevos.c

@@ -24,7 +24,6 @@
 #include "cheevos.h"
 #include "command.h"
 #include "dynamic.h"
-#include "system.h"
 #include "network/net_http_special.h"
 #include "tasks/tasks_internal.h"
 #include "configuration.h"

command.c

@@ -53,7 +53,6 @@
 #include "retroarch.h"
 #include "managers/cheat_manager.h"
 #include "managers/state_manager.h"
-#include "system.h"
 #include "ui/ui_companion_driver.h"
 #include "tasks/tasks_internal.h"
 #include "list_special.h"
@@ -1790,7 +1789,9 @@ void handle_quit_event()
    command_event(CMD_EVENT_RESTORE_DEFAULT_SHADER_PRESET, NULL);
 
 #ifdef HAVE_DYNAMIC
-   command_event(CMD_EVENT_LOAD_CORE_DEINIT, NULL);
+#ifdef HAVE_MENU
+   menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_DEINIT, NULL);
+#endif
 #endif
 
    runloop_ctl(RUNLOOP_CTL_SET_SHUTDOWN, NULL);
@@ -1846,20 +1847,15 @@ bool command_event(enum event_command cmd, void *data)
                runloop_msg_queue_push(msg, 1, 100, true);
             }
          }
-#endif
-         break;
-      case CMD_EVENT_LOAD_CORE_DEINIT:
-#ifdef HAVE_MENU
-         menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_DEINIT, NULL);
 #endif
          break;
       case CMD_EVENT_LOAD_CORE_PERSIST:
-         command_event(CMD_EVENT_LOAD_CORE_DEINIT, NULL);
          {
 #ifdef HAVE_MENU
             bool *ptr = NULL;
             struct retro_system_info *system = NULL;
 
+            menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_DEINIT, NULL);
             menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_GET, &system);
 
             if (menu_driver_ctl(RARCH_MENU_CTL_LOAD_NO_CONTENT_GET, &ptr))
@@ -1990,11 +1986,13 @@ bool command_event(enum event_command cmd, void *data)
                      CONTENT_MODE_LOAD_NOTHING_WITH_DUMMY_CORE,
                      NULL, NULL))
                return false;
-#ifndef HAVE_DYNAMIC
+#ifdef HAVE_DYNAMIC
+#ifdef HAVE_MENU
+         menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_DEINIT, NULL);
+#endif
+#else
          core_unload_game();
          core_unload();
-#else
-         command_event(CMD_EVENT_LOAD_CORE_DEINIT, NULL);
 #endif
          break;
       case CMD_EVENT_QUIT_CONFIRM:

command.h

@@ -43,7 +43,6 @@ enum event_command
    CMD_EVENT_SET_PER_GAME_RESOLUTION,
    CMD_EVENT_SET_FRAME_LIMIT,
    /* Loads core. */
-   CMD_EVENT_LOAD_CORE_DEINIT,
    CMD_EVENT_LOAD_CORE,
    CMD_EVENT_LOAD_CORE_PERSIST,
    CMD_EVENT_UNLOAD_CORE,

config.def.h

@@ -216,7 +216,7 @@ enum
 #define AUDIO_DEFAULT_DRIVER AUDIO_NULL
 #endif
 
-#ifdef PSP
+#if defined(PSP) || defined(EMSCRIPTEN)
 #define AUDIO_DEFAULT_RESAMPLER_DRIVER  AUDIO_RESAMPLER_CC
 #else
 #define AUDIO_DEFAULT_RESAMPLER_DRIVER  AUDIO_RESAMPLER_SINC
@@ -681,7 +681,7 @@ static const char *audio_device = NULL;
 
 /* Desired audio latency in milliseconds. Might not be honored
  * if driver can't provide given latency. */
-#ifdef ANDROID
+#if defined(ANDROID) || defined(EMSCRIPTEN)
 /* For most Android devices, 64ms is way too low. */
 static const int out_latency = 128;
 #else

configuration.c

@@ -36,7 +36,6 @@
 #include "core.h"
 #include "retroarch.h"
 #include "runloop.h"
-#include "system.h"
 #include "verbosity.h"
 #include "lakka.h"
 

core.h

@@ -20,9 +20,12 @@
 
 #include <boolean.h>
 #include <libretro.h>
+
+#include <retro_miscellaneous.h>
 #include <retro_common_api.h>
 
 #include "core_type.h"
+#include "input/input_defines.h"
 
 RETRO_BEGIN_DECLS
 
@@ -40,6 +43,34 @@ enum
    POLL_TYPE_LATE
 };
 
+typedef struct rarch_system_info
+{
+   struct retro_system_info info;
+
+   unsigned rotation;
+   unsigned performance_level;
+
+   const char *input_desc_btn[MAX_USERS][RARCH_FIRST_META_KEY];
+   char valid_extensions[PATH_MAX_LENGTH];
+
+   struct retro_disk_control_callback  disk_control_cb; 
+   struct retro_location_callback      location_cb;
+
+   struct
+   {
+      struct retro_subsystem_info *data;
+      unsigned size;
+   } subsystem;
+
+   struct
+   {
+      struct retro_controller_info *data;
+      unsigned size;
+   } ports;
+   
+   struct retro_memory_map mmaps;
+} rarch_system_info_t;
+
 typedef struct retro_ctx_input_state_info
 {
    retro_input_state_t cb;
@@ -191,6 +222,10 @@ void core_uninit_symbols(void);
 
 void core_set_input_state(retro_ctx_input_state_info_t *info);
 
+bool core_is_symbols_inited(void);
+
+bool core_is_inited(void);
+
 bool core_is_game_loaded(void);
 
 RETRO_END_DECLS

core_impl.c

@@ -32,7 +32,6 @@
 #include "msg_hash.h"
 #include "managers/state_manager.h"
 #include "runloop.h"
-#include "system.h"
 #include "verbosity.h"
 #include "gfx/video_driver.h"
 #include "audio/audio_driver.h"
@@ -42,6 +41,8 @@
 #endif
 
 static struct retro_core_t core;
+static bool                core_inited;
+static bool                core_symbols_inited;
 static bool                core_game_loaded;
 static unsigned            core_poll_type;
 static bool                core_input_polled;
@@ -159,6 +160,8 @@ bool core_deinit(void *data)
    cbs->state_cb        = NULL;
    cbs->poll_cb         = NULL;
 
+   core_inited          = false;
+
    return true;
 }
 
@@ -217,6 +220,7 @@ bool core_set_poll_type(unsigned *type)
 void core_uninit_symbols(void)
 {
    uninit_libretro_sym(&core);
+   core_symbols_inited = false;
 }
 
 bool core_init_symbols(enum rarch_core_type *type)
@@ -224,6 +228,7 @@ bool core_init_symbols(enum rarch_core_type *type)
    if (!type)
       return false;
    init_libretro_sym(*type, &core);
+   core_symbols_inited = true;
    return true;
 }
 
@@ -334,6 +339,7 @@ bool core_reset(void)
 bool core_init(void)
 {
    core.retro_init();
+   core_inited          = true;
    return true;
 }
 
@@ -428,6 +434,16 @@ void core_unset_input_descriptors(void)
    core_has_set_input_descriptors = false;
 }
 
+bool core_is_inited(void)
+{
+  return core_inited;
+}
+
+bool core_is_symbols_inited(void)
+{
+  return core_symbols_inited;
+}
+
 bool core_is_game_loaded(void)
 {
   return core_game_loaded;

database_info.c

@@ -15,8 +15,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdio.h>
 #include <stdint.h>
 
+#include <compat/strl.h>
 #include <retro_endianness.h>
 
 #include "list_special.h"

dist-scripts/dist-cores.sh

@@ -210,7 +210,7 @@ for f in `ls -v *_${platform}.${EXT}`; do
       mkdir -p ../pkg/${platform}/${name}_libretro.vpk/vpk/sce_sys/
       mkdir -p ../pkg/${platform}/${name}_libretro.vpk/vpk/sce_sys/livearea
       mkdir -p ../pkg/${platform}/${name}_libretro.vpk/vpk/sce_sys/livearea/contents
-      vita-make-fself ../retroarch_${platform}.velf ../pkg/${platform}/${name}_libretro.vpk/vpk/eboot.bin
+      vita-make-fself -s ../retroarch_${platform}.velf ../pkg/${platform}/${name}_libretro.vpk/vpk/eboot.bin
       vita-mksfoex -s TITLE_ID=RETR${COUNTER_ID} "RetroArch ${name}" ../pkg/${platform}/${name}_libretro.vpk/vpk/sce_sys/param.sfo
       cp ../pkg/${platform}/assets/ICON0.PNG ../pkg/${platform}/${name}_libretro.vpk/vpk/sce_sys/icon0.png
       cp ../pkg/${platform}/assets/livearea/contents/bg.png ../pkg/${platform}/${name}_libretro.vpk/vpk/sce_sys/livearea/contents/bg.png

driver.c

@@ -20,7 +20,6 @@
 
 #include "command.h"
 #include "msg_hash.h"
-#include "system.h"
 
 #include "audio/audio_driver.h"
 #include "audio/audio_resampler_driver.h"

dynamic.c

@@ -14,6 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdarg.h>
 #include <string.h>
 #include <ctype.h>
 
@@ -40,7 +41,6 @@
 #include "record/record_driver.h"
 #include "core.h"
 #include "performance_counters.h"
-#include "system.h"
 #include "gfx/video_context_driver.h"
 
 #include "cores/internal_cores.h"

file_path_special.h

@@ -46,6 +46,7 @@ enum file_path_enum
    FILE_PATH_CORE_INFO_ZIP,
    FILE_PATH_OVERLAYS_ZIP,
    FILE_PATH_DATABASE_RDB_ZIP,
+   FILE_PATH_SHADERS_SLANG_ZIP,
    FILE_PATH_SHADERS_GLSL_ZIP,
    FILE_PATH_SHADERS_CG_ZIP,
    FILE_PATH_CHEATS_ZIP,

frontend/drivers/platform_ctr.c

@@ -27,6 +27,7 @@
 #endif
 
 #include "../frontend_driver.h"
+#include "../../configuration.h"
 #include "../../verbosity.h"
 #include "../../defaults.h"
 #include "retroarch.h"

frontend/drivers/platform_emscripten.c

@@ -20,6 +20,7 @@
 #include <file/config_file.h>
 #include <queues/task_queue.h>
 
+#include "../../configuration.h"
 #include "../../defaults.h"
 #include "../../general.h"
 #include "../../content.h"

frontend/drivers/platform_linux.c

@@ -42,6 +42,7 @@
 #include <compat/strl.h>
 #include <rhash.h>
 #include <retro_stat.h>
+#include <lists/file_list.h>
 #include <file/file_path.h>
 #include <streams/file_stream.h>
 #include <string/stdstring.h>
@@ -56,6 +57,7 @@
 
 #ifdef HAVE_MENU
 #include "../../menu/menu_display.h"
+#include "../../menu/menu_entries.h"
 #endif
 
 #ifdef ANDROID
@@ -1868,11 +1870,11 @@ static void frontend_linux_init(void *data)
 
 }
 
-#ifdef ANDROID
-static int frontend_android_parse_drive_list(void *data)
+static int frontend_linux_parse_drive_list(void *data)
 {
    file_list_t *list = (file_list_t*)data;
 
+#ifdef ANDROID
    menu_entries_append_enum(list,
          app_dir,
          msg_hash_to_str(MSG_APPLICATION_DIR),
@@ -1886,13 +1888,13 @@ static int frontend_android_parse_drive_list(void *data)
          internal_storage_path,
          msg_hash_to_str(MSG_INTERNAL_MEMORY),
          MSG_INTERNAL_MEMORY, FILE_TYPE_DIRECTORY, 0, 0);
+#endif
 
    menu_entries_append_enum(list, "/", "",
          MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
 
    return 0;
 }
-#endif
 
 #ifndef HAVE_DYNAMIC
 
@@ -2076,11 +2078,7 @@ frontend_ctx_driver_t frontend_ctx_linux = {
    NULL,                         /* load_content */
    frontend_linux_get_architecture,
    frontend_linux_get_powerstate,
-#ifdef ANDROID
-   frontend_android_parse_drive_list, /* parse_drive_list */
-#else
-   NULL,                         /* parse_drive_list */
-#endif
+   frontend_linux_parse_drive_list,
    frontend_linux_get_mem_total,
    frontend_linux_get_mem_used,
    frontend_linux_install_signal_handlers,

gfx/common/drm_common.c

@@ -13,6 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
+
 #include "../../configuration.h"
 #include "../../verbosity.h"
 

gfx/common/gl_common.c

@@ -17,9 +17,7 @@
 #include "../drivers/gl_capabilities.h"
 #include "../video_coord_array.h"
 
-#ifndef NO_GL_FF_MATRIX
 #include <gfx/math/matrix_4x4.h>
-#endif
 
 void gl_ff_vertex(const struct video_coords *coords)
 {

gfx/drivers/gl_shaders/modern_pipeline_xmb_ribbon.glsl.vert.h

@@ -22,29 +22,21 @@ static const char *stock_vertex_xmb_modern = GLSL(
      mix( iqhash(n+170.0), iqhash(n+171.0),f.x),f.y),f.z);
    }
 
-   float xmb_noise2( vec3 x )
-   {
-     return cos((x.z*1.0)*2.0);
-   }
+  float height(vec3 pos )
+  {
+    const float twoPi = 2.0 * 3.14159;
+    float k = twoPi / 20.0;
+    float omega = twoPi / 15.0;
+    float y = sin( k * pos.x - omega * time );
+    y += noise( 0.27 * vec3( 0.4 * pos.x, 3.0, 2.0 * pos.z - 0.5 * time ) );
+    return y;
+  }
 
    void main()
    {
-     vec3 v = vec3(VertexCoord.x, 0.0, VertexCoord.y);
-     vec3 v2 = v;
-     vec3 v3 = v;
-
-     v.y = xmb_noise2(v2)/6.0;
-
-     v3.x = v3.x + time/5.0;
-     v3.x = v3.x / 2.0;
-
-     v3.z = v3.z + time/10.0;
-     v3.y = v3.y + time/100.0;
-
-     v.z = v.z + noise(v3*7.0)/15.0;
-     v.y = v.y + noise(v3*7.0)/15.0 + cos(v.x*2.0-time/5.0)/5.0 - 0.3;
-
-     gl_Position = vec4(v, 1.0);
-     fragVertexEc = gl_Position.xyz;
+    vec3 pos = VertexCoord;
+    pos.y = height( pos );
+    gl_Position = vec4(pos, 0.0, 1.0);
+    fragVertexEc =pos;
    }
 );

gfx/drivers_font/vulkan_raster_font.c

@@ -13,6 +13,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <string.h>
+
+#include <compat/strl.h>
+
 #include "../common/vulkan_common.h"
 
 #include "../font_driver.h"

gfx/drivers_shader/shader_vulkan.cpp

@@ -23,12 +23,14 @@
 #include <string.h>
 #include <math.h>
 
+#include <compat/strl.h>
+#include <formats/image.h>
+
 #include "slang_reflection.hpp"
 
 #include "../video_shader_driver.h"
 #include "../../verbosity.h"
 #include "../../msg_hash.h"
-#include "../../libretro-common/include/formats/image.h"
 
 using namespace std;
 

gfx/video_context_driver.c

@@ -16,6 +16,7 @@
 
 #include <string.h>
 
+#include <compat/strl.h>
 #include <string/stdstring.h>
 
 #include "video_context_driver.h"

gfx/video_driver.c

@@ -24,6 +24,7 @@
 #include <rthreads/rthreads.h>
 #endif
 
+#include <compat/strl.h>
 #include <retro_common_api.h>
 #include <file/config_file.h>
 #include <features/features_cpu.h>
@@ -40,7 +41,6 @@
 #include "../performance_counters.h"
 #include "../list_special.h"
 #include "../core.h"
-#include "../system.h"
 #include "../command.h"
 #include "../msg_hash.h"
 

gfx/video_thread_wrapper.c

@@ -18,6 +18,7 @@
 #include <string.h>
 #include <limits.h>
 
+#include <compat/strl.h>
 #include <features/features_cpu.h>
 #include <rthreads/rthreads.h>
 

httpserver/httpserver.c

@@ -1,5 +1,5 @@
 #include <libretro.h>
-#include "system.h"
+#include "core.h"
 #include "runloop.h"
 #include "core.h"
 #include "gfx/video_driver.h"

input/drivers/udev_input.c

@@ -37,6 +37,7 @@
 #endif
 
 #include <file/file_path.h>
+#include <compat/strl.h>
 #include <string/stdstring.h>
 
 #include "../drivers_keyboard/keyboard_event_udev.h"

input/drivers/x11_input.c

@@ -20,6 +20,7 @@
 #include <X11/keysym.h>
 
 #include <boolean.h>
+#include <compat/strl.h>
 
 #include "../input_config.h"
 #include "../input_joypad_driver.h"

input/drivers_joypad/linuxraw_joypad.c

@@ -24,6 +24,8 @@
 #include <sys/inotify.h>
 #include <linux/joystick.h>
 
+#include <compat/strl.h>
+
 #include "../common/epoll_common.h"
 #include "../input_autodetect.h"
 #include "../input_driver.h"

input/drivers_joypad/parport_joypad.c

@@ -23,6 +23,8 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 
+#include <compat/strl.h>
+
 #include "../input_autodetect.h"
 #include "../input_driver.h"
 #include "../../configuration.h"

input/drivers_joypad/sdl_joypad.c

@@ -16,6 +16,8 @@
 
 #include <stdint.h>
 
+#include <compat/strl.h>
+
 #include "SDL.h"
 
 #include "../../configuration.h"

input/drivers_joypad/udev_joypad.c

@@ -29,6 +29,7 @@
 #include <linux/input.h>
 
 #include <retro_inline.h>
+#include <compat/strl.h>
 #include <string/stdstring.h>
 
 #include "../input_autodetect.h"

input/input_config.c

@@ -18,6 +18,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 
+#include <compat/strl.h>
 #include <file/file_path.h>
 #include <string/stdstring.h>
 

intl/msg_hash_de.c

@@ -785,7 +785,7 @@ const char *msg_hash_to_str_de(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_REWIND_ENABLE:
          return "Zurückspulen (Rewind) aktivieren";
       case MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST:
-         return "Lade Content (Sammlung)";  /* FIXME */
+         return "Lade Content (Sammlung)";  /* FIXME/TODO - rewrite */
       case MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST:
          return "Lade Content (Core erkennen)";  /* FIXME */
       case MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY:
@@ -877,7 +877,7 @@ const char *msg_hash_to_str_de(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND:
          return "Navigation umbrechen";
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE:
-         return "Bekannte Dateiendungen filtern";
+         return "Bekannte Dateiendungen filtern"; /* TODO/FIXME - rewrite */
       case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE:
          return "Heruntergeladene Archive automatisch entpacken";
       case MENU_ENUM_LABEL_VALUE_SYSTEM_INFORMATION:

intl/msg_hash_es.c

@@ -1884,7 +1884,7 @@ const char *msg_hash_to_str_es(enum msg_hash_enums msg)
          return "Seleccionar de una colección";
       case MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST:
          return "Seleccionar archivo y detectar núcleo";
-      case MENU_ENUM_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST:
+      case MENU_ENUM_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST: /* TODO/FIXME - rewrite */
          return "Seleccionar archivo descargado y detectar núcleo";
       case MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY:
          return "Cargar archivos recientes";
@@ -1979,7 +1979,7 @@ const char *msg_hash_to_str_es(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND:
          return "Seguir navegación";
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE:
-         return "Filtrar por extensiones compatibles";
+         return "Filtrar por extensiones compatibles"; /* TODO/FIXME - rewrite */
       case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE:
          return "Extraer automáticamente el archivo descargado";
       case MENU_ENUM_LABEL_VALUE_SYSTEM_INFORMATION:

intl/msg_hash_fr.c

@@ -602,10 +602,10 @@ const char *msg_hash_to_str_fr(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_REWIND_ENABLE:
          return "Activer le rembobinage";
       case MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST:
-         return "Via les collections";
+         return "Collections";
       case MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST:
          return "Via les fichiers (détecter le coeur)";
-      case MENU_ENUM_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST:
+      case MENU_ENUM_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST: /* FIXME/TODO - rewrite */
          return "Via les téléchargements (détecter le coeur)";
       case MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY:
          return "Récemment ouvert";
@@ -690,7 +690,7 @@ const char *msg_hash_to_str_fr(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND:
          return "Saut-retour";
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE:
-         return "Filtrer par extentions supportées";
+         return "Filtrer par extentions supportées"; /* TODO/FIXME - rewrite */
       case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE:
          return "Extraire automatiquement";
       case MENU_ENUM_LABEL_VALUE_SYSTEM_INFORMATION:

intl/msg_hash_it.c

@@ -1584,10 +1584,10 @@ const char *msg_hash_to_str_it(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_REWIND_ENABLE:
          return "Abilita riavvolgi";
       case MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST:
-         return "Seleziona dalla collezione";
+         return "Collezione";
       case MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST:
          return "Seleziona il file ed intercetta il core";
-      case MENU_ENUM_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST:
+      case MENU_ENUM_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST: /* TODO/FIXME - rewrite */
          return "Seleziona file scaricati ed intercetta il core";
       case MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY:
          return "Carica Recenti";
@@ -1682,7 +1682,7 @@ const char *msg_hash_to_str_it(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND:
          return "Navigazione avvolgente";
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE:
-         return "Filtra con estensioni supportate";
+         return "Filtra con estensioni supportate"; /* TODO/FIXME - rewrite */
       case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE:
          return "Estrai automaticamente gli archivi scaricati";
       case MENU_ENUM_LABEL_VALUE_SYSTEM_INFORMATION:

intl/msg_hash_jp.c

@@ -3915,12 +3915,8 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
          return "Apply Shader Changes";
       case MENU_ENUM_LABEL_VALUE_REWIND_ENABLE:
          return "Rewind Enable";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST:
-         return "Select From Collection";
       case MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST:
          return "Select File And Detect Core";
-      case MENU_ENUM_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST:
-         return "Select Downloaded File And Detect Core";
       case MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY:
          return "Load Recent";
       case MENU_ENUM_LABEL_VALUE_AUDIO_ENABLE:
@@ -4019,8 +4015,6 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
          return "Buildbot Assets URL";
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND:
          return "Navigation Wrap-Around";
-      case MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE:
-         return "Filter by supported extensions";
       case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE:
          return "Automatically extract downloaded archive";
       case MENU_ENUM_LABEL_VALUE_SYSTEM_INFORMATION:

intl/msg_hash_nl.c

@@ -458,7 +458,7 @@ const char *msg_hash_to_str_nl(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_REWIND_ENABLE:
          return "Rewind Activeren";
       case MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST:
-         return "Selecteer uit verzameling";
+         return "Verzameling";
       case MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST:
          return "Selecteer bestand en detecteer Core";
       case MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY:
@@ -550,7 +550,7 @@ const char *msg_hash_to_str_nl(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND:
          return "Navigatie Wrap-Around";
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE:
-         return "Filter op ondersteunde extensies";
+         return "Filtreer onbekende extensies";
       case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE:
          return "Automatisch uitpakken van gedownloade archieven";
       case MENU_ENUM_LABEL_VALUE_SYSTEM_INFORMATION:

intl/msg_hash_pl.c

@@ -563,11 +563,11 @@ const char *msg_hash_to_str_pl(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_REWIND_ENABLE:
          return "W³±cz przewijanie";
       case MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST:
-         return "Wybierz z kolekcji";
+         return "Kolekcji";
       case MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST:
          return "Wybierz plik i dopasuj rdzeñ";
       case MENU_ENUM_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST:
-         return "Wybierz pobrany plik i dopasuj rdzeñ"; /* this makes little sense */
+         return "Wybierz pobrany plik i dopasuj rdzeñ"; /* TODO/FIXME - rewrite */
       case MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY:
          return "Wczytaj z ostatnio u¿ywanych";
       case MENU_ENUM_LABEL_VALUE_AUDIO_ENABLE:
@@ -657,7 +657,7 @@ const char *msg_hash_to_str_pl(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND:
          return "Zawijanie nawigacji";
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE:
-         return "Filtruj wed³ug wspieranych rozszerzeñ";
+         return "Filtruj wed³ug wspieranych rozszerzeñ"; /* TODO/FIXME - rewrite */
       case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE:
          return "Automatycznie wypakowuj pobierane archiwa";
       case MENU_ENUM_LABEL_VALUE_SYSTEM_INFORMATION:

intl/msg_hash_pt.c

@@ -1465,7 +1465,7 @@ const char *msg_hash_to_str_pt(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_REWIND_ENABLE:
          return "Ativar Retrocesso";
       case MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST:
-         return "Selecionar da Coleção";
+         return "Coleção";
       case MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST:
          return "Selecionar Arquivo e Detectar Core";
       case MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY:
@@ -1561,7 +1561,7 @@ const char *msg_hash_to_str_pt(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND:
          return "Navegação Circular";
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE:
-         return "Filtrar por Extensões Suportadas";
+         return "Filtrar por Extensões Suportadas"; /* TODO/FIXME - rewrite */
       case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE:
          return "Autoextrair Arquivos Baixados";
       case MENU_ENUM_LABEL_VALUE_SYSTEM_INFORMATION:

intl/msg_hash_us.c

@@ -3984,11 +3984,11 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_REWIND_ENABLE:
          return "Rewind Enable";
       case MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST:
-         return "Select From Collection";
+         return "Collections";
       case MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST:
          return "Select File And Detect Core";
       case MENU_ENUM_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST:
-         return "Select Downloaded File And Detect Core";
+         return "Downloads Dir";
       case MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY:
          return "Load Recent";
       case MENU_ENUM_LABEL_VALUE_AUDIO_ENABLE:
@@ -4090,7 +4090,7 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND:
          return "Navigation Wrap-Around";
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE:
-         return "Filter by supported extensions";
+         return "Filter unknown extensions";
       case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE:
          return "Automatically extract downloaded archive";
       case MENU_ENUM_LABEL_VALUE_SYSTEM_INFORMATION:

intl/msg_hash_uspseudo.c

@@ -4025,7 +4025,7 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND:
          return "Ñavigatìon Wrap-Ãroúñd";
       case MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE:
-         return "Filter bý suppòrtêd èxtensiøns";
+         return "Filter bý suppòrtêd èxtensiøns"; /* TODO/FIXME - rewrite */
       case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE:
          return "Ãutomätically extract downlôadéd ärchive";
       case MENU_ENUM_LABEL_VALUE_SYSTEM_INFORMATION:

location/location_driver.c

@@ -23,10 +23,10 @@
 #include "location_driver.h"
 
 #include "../configuration.h"
+#include "../core.h"
 #include "../driver.h"
 #include "../retroarch.h"
 #include "../runloop.h"
-#include "../system.h"
 #include "../list_special.h"
 #include "../verbosity.h"
 

menu/cbs/menu_cbs_deferred_push.c

@@ -13,6 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
 #include <file/file_path.h>
 #include <string/stdstring.h>
 #include <lists/string_list.h>
@@ -28,9 +29,9 @@
 #include "../../cores/internal_cores.h"
 
 #include "../../configuration.h"
+#include "../../core.h"
 #include "../../core_info.h"
 #include "../../runloop.h"
-#include "../../system.h"
 #include "../../verbosity.h"
 
 #ifndef BIND_ACTION_DEFERRED_PUSH

menu/cbs/menu_cbs_get_value.c

@@ -27,6 +27,7 @@
 #include "../../input/input_autodetect.h"
 #include "../../input/input_config.h"
 
+#include "../../core.h"
 #include "../../core_info.h"
 #include "../../configuration.h"
 #include "../../file_path_special.h"
@@ -34,7 +35,6 @@
 #include "../../managers/cheat_manager.h"
 #include "../../performance_counters.h"
 #include "../../runloop.h"
-#include "../../system.h"
 #include "../../intl/intl.h"
 
 #ifndef BIND_ACTION_GET_VALUE

menu/cbs/menu_cbs_left.c

@@ -27,12 +27,12 @@
 #include "../menu_navigation.h"
 
 #include "../../configuration.h"
+#include "../../core.h"
 #include "../../core_info.h"
 #include "../../managers/cheat_manager.h"
 #include "../../file_path_special.h"
 #include "../../retroarch.h"
 #include "../../runloop.h"
-#include "../../system.h"
 
 #ifndef BIND_ACTION_LEFT
 #define BIND_ACTION_LEFT(cbs, name) \

menu/cbs/menu_cbs_ok.c

@@ -30,6 +30,7 @@
 #include "../menu_popup.h"
 #include "../menu_content.h"
 
+#include "../../core.h"
 #include "../../configuration.h"
 #include "../../core_info.h"
 #include "../../frontend/frontend_driver.h"
@@ -39,7 +40,6 @@
 #include "../../input/input_remapping.h"
 #include "../../retroarch.h"
 #include "../../runloop.h"
-#include "../../system.h"
 #include "../../verbosity.h"
 #include "../../lakka.h"
 

menu/cbs/menu_cbs_right.c

@@ -27,12 +27,12 @@
 #include "../menu_navigation.h"
 
 #include "../../configuration.h"
+#include "../../core.h"
 #include "../../core_info.h"
 #include "../../managers/cheat_manager.h"
 #include "../../file_path_special.h"
 #include "../../retroarch.h"
 #include "../../runloop.h"
-#include "../../system.h"
 #include "../../ui/ui_companion_driver.h"
 
 #ifndef BIND_ACTION_RIGHT

menu/cbs/menu_cbs_start.c

@@ -25,12 +25,12 @@
 #include "../menu_shader.h"
 
 #include "../../configuration.h"
+#include "../../core.h"
 #include "../../core_info.h"
 #include "../../managers/core_option_manager.h"
 #include "../../managers/cheat_manager.h"
 #include "../../retroarch.h"
 #include "../../runloop.h"
-#include "../../system.h"
 #include "../../performance_counters.h"
 
 #include "../../gfx/video_shader_driver.h"

menu/drivers/materialui.c

@@ -22,6 +22,7 @@
 #include <limits.h>
 
 #include <compat/posix_string.h>
+#include <compat/strl.h>
 #include <file/file_path.h>
 #include <formats/image.h>
 #include <gfx/math/matrix_4x4.h>
@@ -37,10 +38,10 @@
 #include "../menu_display.h"
 
 #include "../../core_info.h"
+#include "../../core.h"
 #include "../../configuration.h"
 #include "../../frontend/frontend_driver.h"
 #include "../../retroarch.h"
-#include "../../system.h"
 #include "../../runloop.h"
 #include "../../verbosity.h"
 #include "../../tasks/tasks_internal.h"

menu/drivers/nuklear.c

@@ -39,10 +39,10 @@
 #include "../menu_navigation.h"
 #include "../menu_display.h"
 
+#include "../../core.h"
 #include "../../core_info.h"
 #include "../../configuration.h"
 #include "../../frontend/frontend_driver.h"
-#include "../../system.h"
 #include "../../runloop.h"
 #include "../../verbosity.h"
 #include "../../tasks/tasks_internal.h"

menu/drivers/xmb.c

@@ -41,10 +41,10 @@
 #include "../menu_cbs.h"
 
 #include "../../frontend/frontend_driver.h"
+#include "../../core.h"
 #include "../../verbosity.h"
 #include "../../configuration.h"
 #include "../../retroarch.h"
-#include "../../system.h"
 #include "../../file_path_special.h"
 
 #include "../../tasks/tasks_internal.h"

menu/menu_content.c

@@ -13,6 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
 #include <retro_assert.h>
 #include <streams/file_stream.h>
 #include <file/file_path.h>

menu/menu_displaylist.c

@@ -42,7 +42,6 @@
 #include "../managers/core_option_manager.h"
 #include "../retroarch.h"
 #include "../runloop.h"
-#include "../system.h"
 #include "../core.h"
 #include "../frontend/frontend_driver.h"
 #include "../ui/ui_companion_driver.h"

menu/menu_driver.c

@@ -16,6 +16,7 @@
 
 #include <string.h>
 
+#include <compat/strl.h>
 #include <file/file_path.h>
 #include <string/stdstring.h>
 
@@ -31,9 +32,9 @@
 #include "../content.h"
 #include "../configuration.h"
 #include "../dynamic.h"
+#include "../core.h"
 #include "../core_info.h"
 #include "../retroarch.h"
-#include "../system.h"
 #include "../defaults.h"
 #include "../frontend/frontend.h"
 #include "../list_special.h"

menu/menu_entries.c

@@ -24,9 +24,9 @@
 #include "menu_cbs.h"
 #include "menu_navigation.h"
 
+#include "../core.h"
 #include "../configuration.h"
 #include "../runloop.h"
-#include "../system.h"
 #include "../version.h"
 
 struct menu_list

menu/menu_setting.c

@@ -45,11 +45,11 @@
 #include "menu_input.h"
 #include "menu_navigation.h"
 
+#include "../core.h"
 #include "../configuration.h"
 #include "../msg_hash.h"
 #include "../defaults.h"
 #include "../driver.h"
-#include "../system.h"
 #include "../core.h"
 #include "../dynamic.h"
 #include "../runloop.h"

movie.c

@@ -19,6 +19,7 @@
 #include <string.h>
 
 #include <rhash.h>
+#include <compat/strl.h>
 #include <retro_endianness.h>
 
 #include "configuration.h"

network/netplay/netplay.c

@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <compat/strl.h>
 #include <net/net_compat.h>
 #include <net/net_socket.h>
 #include <retro_endianness.h>

network/netplay/netplay_common.c

@@ -14,6 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
+
 #include "netplay_private.h"
 #include <net/net_socket.h>
 

network/netplay/netplay_net.c

@@ -14,6 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
+
 #include "netplay_private.h"
 
 #include "../../autosave.h"

network/netplay/netplay_private.h

@@ -22,8 +22,8 @@
 #include <net/net_compat.h>
 #include <retro_endianness.h>
 
+#include "../../core.h"
 #include "../../msg_hash.h"
-#include "../../system.h"
 #include "../../verbosity.h"
 
 #ifdef ANDROID

network/netplay/netplay_spectate.c

@@ -14,6 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>

pkg/emscripten/index.html

@@ -13,13 +13,13 @@
          <a class="navbar-brand" href="#">RetroArch</a>
          <ul class="nav navbar-nav">
            <li class="nav-item gambatte">
-               <a class="nav-link" href="./?core=gambatte">Gambatte</a>
+               <a class="nav-link" href="." onclick=switchCore("gambatte")>Gambatte</a>
             </li>
            <li class="nav-item snes9x2010">
-               <a class="nav-link" href="./?core=snes9x2010">Snex9x 2010</a>
+               <a class="nav-link" href="." onclick=switchCore("snes9x2010")>Snes9X 2010</a>
             </li>
            <li class="nav-item vba_next">
-               <a class="nav-link vba_next" href="./?core=vba_next">VBA Next</a>
+               <a class="nav-link" href="." onclick=switchCore("vba_next")>VBA Next</a>
             </li>
          </ul>
       </div>

pkg/emscripten/webplayer.js

@@ -215,14 +215,17 @@ var Module =
   }
 };
 
+function switchCore(corename) {
+   localStorage.setItem("core", corename);
+}
+
 // When the browser has loaded everything.
 $(function() {
   // Find which core to load.
-  var core = getParam('core');
+  var core = localStorage.getItem("core", core);
   if (!core) {
     core = 'gambatte';
   }
-
   // Show the current core as the active core.
   $('.nav-item.' + core).addClass('active');
 
@@ -234,6 +237,7 @@ $(function() {
     /**
      * Attempt to disable some default browser keys.
      */
+
     window.addEventListener('keydown', function(e) {
       // Space key, arrows, and F1.
       if([32, 37, 38, 39, 40, 112].indexOf(e.keyCode) > -1) {

retroarch.c

@@ -61,7 +61,6 @@
 #include "configuration.h"
 #include "runloop.h"
 #include "managers/cheat_manager.h"
-#include "system.h"
 #include "tasks/tasks_internal.h"
 
 #include "version.h"

runloop.c

@@ -46,7 +46,6 @@
 #include "managers/core_option_manager.h"
 #include "managers/cheat_manager.h"
 #include "managers/state_manager.h"
-#include "system.h"
 #include "list_special.h"
 #include "audio/audio_driver.h"
 #include "camera/camera_driver.h"

system.h

@@ -1,58 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2016 - Daniel De Matteis
- * 
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __RARCH_SYSTEM_H
-#define __RARCH_SYSTEM_H
-
-#include <retro_miscellaneous.h>
-#include <retro_common_api.h>
-#include <libretro.h>
-
-#include "input/input_defines.h"
-
-RETRO_BEGIN_DECLS
-
-typedef struct rarch_system_info
-{
-   struct retro_system_info info;
-
-   unsigned rotation;
-   unsigned performance_level;
-
-   const char *input_desc_btn[MAX_USERS][RARCH_FIRST_META_KEY];
-   char valid_extensions[PATH_MAX_LENGTH];
-
-   struct retro_disk_control_callback  disk_control_cb; 
-   struct retro_location_callback      location_cb;
-
-
-   struct
-   {
-      struct retro_subsystem_info *data;
-      unsigned size;
-   } subsystem;
-
-   struct
-   {
-      struct retro_controller_info *data;
-      unsigned size;
-   } ports;
-   
-   struct retro_memory_map mmaps;
-} rarch_system_info_t;
-
-RETRO_END_DECLS
-
-#endif

tasks/task_content.c

@@ -81,7 +81,6 @@
 #include "../content.h"
 #include "../dynamic.h"
 #include "../patch.h"
-#include "../system.h"
 #include "../runloop.h"
 #include "../retroarch.h"
 #include "../file_path_special.h"

tasks/task_overlay.c

@@ -15,6 +15,8 @@
 
 #include <stdlib.h>
 
+#include <compat/strl.h>
+#include <compat/posix_string.h>
 #include <retro_miscellaneous.h>
 #include <file/file_path.h>
 #include <file/config_file.h>

tasks/task_save_state.c

@@ -26,6 +26,7 @@
 #endif
 #include <errno.h>
 
+#include <compat/strl.h>
 #include <lists/string_list.h>
 #include <streams/file_stream.h>
 #include <file/file_path.h>

ui/drivers/ui_cocoa.m

@@ -31,9 +31,9 @@
 #include "../../input/drivers_keyboard/keyboard_event_apple.h"
 #include "../../frontend/frontend.h"
 #include "../../configuration.h"
+#include "../../core.h"
 #include "../../retroarch.h"
 #include "../../runloop.h"
-#include "../../system.h"
 #include "../../tasks/tasks_internal.h"
 
 id apple_platform;

ui/drivers/ui_qt.cpp

@@ -18,14 +18,15 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include "general.h"
-#include "system.h"
 
 #include <file/file_path.h>
 #include <rthreads/rthreads.h>
 
+#include "general.h"
+
 #include "ui_qt.h"
 #include "../ui_companion_driver.h"
+#include "../../core.h"
 #include "../../configuration.h"
 #include "../../tasks/tasks_internal.h"
 #include "qt/wrapper/wrapper.h"

verbosity.c

@@ -26,6 +26,9 @@
 #endif
 #endif
 
+#include <stdio.h>
+#include <stdarg.h>
+
 #ifdef ANDROID
 #include <android/log.h>
 #endif
@@ -60,7 +63,7 @@ bool *verbosity_get_ptr(void)
    return &main_verbosity;
 }
 
-FILE *retro_main_log_file(void)
+void *retro_main_log_file(void)
 {
    return log_file;
 }

verbosity.h

@@ -16,13 +16,10 @@
 #ifndef __RARCH_VERBOSITY_H
 #define __RARCH_VERBOSITY_H
 
-#include <stdio.h>
 #include <stdarg.h>
 
 #include <boolean.h>
 #include <retro_common_api.h>
-#include <compat/posix_string.h>
-#include <compat/strl.h>
 
 RETRO_BEGIN_DECLS
 
@@ -34,7 +31,7 @@ void verbosity_disable(void);
 
 bool *verbosity_get_ptr(void);
 
-FILE *retro_main_log_file(void);
+void *retro_main_log_file(void);
 
 void retro_main_log_file_deinit(void);