admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #286 from retro-wertz/core_option_sublabel

Browse Source 
dipswitch option sublabel update and fixes
This commit is contained in:
hizzlekizzle
2019-07-20 22:40:38 -05:00
committed by GitHub
parent 191cdcc11c 8446a7ba58
commit 74c4b02f83
5 changed files with 561 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

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

6
Makefile.libretro
View File

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

6
src/drivers/libretro/libretro.c
View File

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

945
src/drivers/libretro/dipswitch.c → src/drivers/libretro/libretro_dipswitch.c
View File

File diff suppressed because it is too large Load Diff

3
src/drivers/libretro/dipswitch.h → src/drivers/libretro/libretro_dipswitch.h
View File

@@ -3,8 +3,9 @@
#include <libretro.h> #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 update_dipswitch(void);
void DPSW_Cleanup(void);
extern retro_environment_t environ_cb; extern retro_environment_t environ_cb;