libretro/gambatte-libretro
1
0
Fork 0
mirror of https://github.com/libretro/gambatte-libretro.git synced 2024-11-23 07:49:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
meepingsnesroms 2017-02-17 13:43:35 -08:00 committed by GitHub
commit 537603d288
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.common
View File

@ -1,5 +1,7 @@
INCFLAGS := -I$(CORE_DIR) -I$(CORE_DIR)/../include -I$(CORE_DIR)/../../common -I$(CORE_DIR)/../../common/resample -I$(CORE_DIR)/../libretro -I$(CORE_DIR)/../libretro-common/include
LIBRETRO_COMM_DIR := $(CORE_DIR)/../libretro-common
INCFLAGS := -I$(CORE_DIR) -I$(CORE_DIR)/../include -I$(CORE_DIR)/../../common -I$(CORE_DIR)/../../common/resample -I$(CORE_DIR)/../libretro -I$(LIBRETRO_COMM_DIR)/include
SOURCES_C :=
SOURCES_CXX := $(CORE_DIR)/bootloader.cpp \
$(CORE_DIR)/cpu.cpp \
$(CORE_DIR)/gambatte.cpp \
@ -34,8 +36,10 @@ ifeq ($(HAVE_NETWORK),1)
SOURCES_CXX += $(CORE_DIR)/../libretro/net_serial.cpp
endif
SOURCES_C := $(CORE_DIR)/../libretro/blipper.c \
$(CORE_DIR)/../libretro-common/streams/file_stream.c \
$(CORE_DIR)/../libretro-common/string/stdstring.c
ifeq ($(STATIC_LINKING),1)
else
SOURCES_C += $(CORE_DIR)/../libretro/blipper.c \
$(LIBRETRO_COMM_DIR)/streams/file_stream.c \
$(LIBRETRO_COMM_DIR)/string/stdstring.c
endif
INCFLAGS := -I$(CORE_DIR) -I$(CORE_DIR)/../include -I$(CORE_DIR)/../../common -I$(CORE_DIR)/../../common/resample -I$(CORE_DIR)/../libretro -I$(CORE_DIR)/../libretro-common/include

1
Makefile.libretro
View File

@ -276,6 +276,7 @@ else ifneq (,$(findstring armv,$(platform)))
# emscripten
else ifeq ($(platform), emscripten)
TARGET := $(TARGET_NAME)_libretro_$(platform).bc
STATIC_LINKING = 1
# GCW0
else ifeq ($(platform), gcw0)

6
libgambatte/libretro/libretro.cpp
View File

@ -288,7 +288,7 @@ void retro_set_environment(retro_environment_t cb)
{ "gambatte_gb_colorization", "GB Colorization; disabled|auto|internal|custom" },
{ "gambatte_gb_internal_palette", "Internal Palette; GBC - Blue|GBC - Brown|GBC - Dark Blue|GBC - Dark Brown|GBC - Dark Green|GBC - Grayscale|GBC - Green|GBC - Inverted|GBC - Orange|GBC - Pastel Mix|GBC - Red|GBC - Yellow|Special 1|Special 2|Special 3" },
{ "gambatte_gbc_color_correction", "Color correction; enabled|disabled" },
{ "gambatte_gb_hwmode", "Emulated hardware; Auto|GB|GBC|GBA" },
{ "gambatte_gb_hwmode", "Emulated hardware (restart); Auto|GB|GBC|GBA" },
{ "gambatte_gb_bootloader", "Use official bootloader (restart); enabled|disabled" },
#ifdef HAVE_NETWORK
{ "gambatte_gb_link_mode", "GameBoy Link Mode; Not Connected|Network Server|Network Client" },
@ -609,8 +609,8 @@ static void check_variables(void)
gbc_bios_palette = const_cast<unsigned short*>(findGbcTitlePal(internal_game_name));
if (!gbc_bios_palette)
{
// no custom palette found, load the default (blue)
gbc_bios_palette = const_cast<unsigned short*>(findGbcDirPal("GBC - Blue"));
// no custom palette found, load the default (Dark Green, such as GBC BIOS)
gbc_bios_palette = const_cast<unsigned short*>(findGbcDirPal("GBC - Dark Green"));
}
break;