Merge pull request #286 from retro-wertz/core_option_sublabel

dipswitch option sublabel update and fixes

Makefile.common

@@ -57,4 +57,4 @@ endif
 SOURCES_C += \
 				 $(CORE_DIR)/ines.c \
 				 $(CORE_DIR)/unif.c $(CORE_DIR)/x6502.c \
-				 $(CORE_DIR)/drivers/libretro/dipswitch.c
+				 $(CORE_DIR)/drivers/libretro/libretro_dipswitch.c

Makefile.libretro

@@ -651,6 +651,12 @@ else
 	endif
 endif
 
+ifneq ($(SANITIZER),)
+CFLAGS += -fsanitize=$(SANITIZER)
+CXXFLAGS += -fsanitize=$(SANITIZER)
+LDFLAGS += -fsanitize=$(SANITIZER)
+endif
+
 ifeq ($(EXTERNAL_ZLIB), 1)
 	CFLAGS += -DHAVE_EXTERNAL_ZLIB
 endif

src/drivers/libretro/libretro.c

@@ -29,7 +29,7 @@
 #endif
 
 #include "libretro-common/include/streams/memory_stream.h"
-#include "dipswitch.h"
+#include "libretro_dipswitch.h"
 #include "libretro_core_options.h"
 
 #define MAX_PLAYERS 4 /* max supported players */
@@ -759,7 +759,8 @@ static void set_variables(void)
    }
 
    /* Append dipswitch settings to core options if available */
-   set_dipswitch_variables(&index, option_defs_us);
+   index += set_dipswitch_variables(index, option_defs_us);
+   option_defs_us[index] = option_defs_empty;
 
    libretro_set_core_options(environ_cb);
 }
@@ -987,6 +988,7 @@ void retro_deinit (void)
    ps2 = NULL;
 #endif
    libretro_supports_bitmasks = false;
+   DPSW_Cleanup();
 }
 
 void retro_reset(void)

src/drivers/libretro/libretro_dipswitch.h

@@ -3,8 +3,9 @@
 
 #include <libretro.h>
 
-void set_dipswitch_variables(unsigned *index, struct retro_core_option_definition *vars);
+size_t set_dipswitch_variables(unsigned current_index, struct retro_core_option_definition *vars);
 void update_dipswitch(void);
+void DPSW_Cleanup(void);
 
 extern retro_environment_t environ_cb;