Merge pull request #131 from retro-wertz/updates

update libretro.h, libretro-common and notify that core supports retroarchievements

Makefile.common

@@ -1,4 +1,4 @@
-INCFLAGS      := -I$(CORE_DIR)/drivers/libretro -I$(CORE_DIR) -I$(CORE_DIR)/input -I$(CORE_DIR)/boards -I$(CORE_DIR)/mappers
+INCFLAGS      := -I$(CORE_DIR)/drivers/libretro -I$(CORE_DIR)/drivers/libretro/libretro-common/include -I$(CORE_DIR) -I$(CORE_DIR)/input -I$(CORE_DIR)/boards -I$(CORE_DIR)/mappers
 COREDEFINES    = -D__LIBRETRO__ -DSOUND_QUALITY=0 -DPATH_MAX=1024 -DFCEU_VERSION_NUMERIC=9813 -DFRONTEND_SUPPORTS_RGB565 
 
 ifneq (,$(findstring msvc,$(platform)))

src/drivers/libretro/libretro-common/compat/compat_snprintf.c

@@ -30,7 +30,7 @@
 
 /* http://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010 */
 
-int vsnprintf(char *outBuf, size_t size, const char *format, va_list ap)
+int c99_vsnprintf_retro__(char *outBuf, size_t size, const char *format, va_list ap)
 {
    int count = -1;
 
@@ -46,7 +46,7 @@ int vsnprintf(char *outBuf, size_t size, const char *format, va_list ap)
    return count;
 }
 
-int snprintf(char *outBuf, size_t size, const char *format, ...)
+int c99_snprintf_retro__(char *outBuf, size_t size, const char *format, ...)
 {
    int count;
    va_list ap;

src/drivers/libretro/libretro-common/include/streams/memory_stream.h

@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2017 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (memory_stream.h).
@@ -26,6 +26,10 @@
 #include <stdint.h>
 #include <stddef.h>
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
 typedef struct memstream memstream_t;
 
 memstream_t *memstream_open(unsigned writing);
@@ -52,4 +56,6 @@ void memstream_set_buffer(uint8_t *buffer, size_t size);
 
 size_t memstream_get_last_size(void);
 
+RETRO_END_DECLS
+
 #endif

src/drivers/libretro/libretro-common/streams/memory_stream.c

@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2016 The RetroArch team
+/* Copyright  (C) 2010-2017 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (memory_stream.c).
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../include/streams/memory_stream.h"
+#include <streams/memory_stream.h>
 
 static uint8_t* g_buffer     = NULL;
 static size_t g_size         = 0;
@@ -41,7 +41,7 @@ struct memstream
 
 static void memstream_update_pos(memstream_t *stream)
 {
-   if (stream->ptr > stream->max_ptr)
+   if (stream && stream->ptr > stream->max_ptr)
       stream->max_ptr = stream->ptr;
 }
 

src/drivers/libretro/libretro.c

@@ -766,6 +766,10 @@ void retro_init(void)
    enum retro_pixel_format rgb565;
    log_cb.log=default_logger;
    environ_cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &log_cb);
+
+   bool achievements = true;
+   environ_cb(RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS, &achievements);
+
 #ifdef FRONTEND_SUPPORTS_RGB565
    rgb565 = RETRO_PIXEL_FORMAT_RGB565;
    if(environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &rgb565))
@@ -1053,39 +1057,9 @@ static void check_variables(bool startup)
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
-      if (!strcmp(var.value, "1"))
-      {
-         turbo_delay = 1;
-      }
-      if (!strcmp(var.value, "2"))
-      {
-         turbo_delay = 2;
-      }
-      else if (!strcmp(var.value, "3"))
-      {
-         turbo_delay = 3;
-      }
-      else if (!strcmp(var.value, "5"))
-      {
-         turbo_delay = 5;
-      }
-      else if (!strcmp(var.value, "10"))
-      {
-         turbo_delay = 10;
-      }
-	  else if (!strcmp(var.value, "15"))
-      {
-         turbo_delay = 15;
-      }
-      else if (!strcmp(var.value, "30"))
-      {
-         turbo_delay = 30;
-      }
-      else if (!strcmp(var.value, "60"))
-      {
-         turbo_delay = 60;
-      }
+      turbo_delay = atoi(var.value);
    }
+   
    var.key = "fceumm_region";
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {