diff --git a/higan/emulator/emulator.hpp b/higan/emulator/emulator.hpp index e051c79b..eff1861d 100644 --- a/higan/emulator/emulator.hpp +++ b/higan/emulator/emulator.hpp @@ -12,7 +12,7 @@ using namespace nall; namespace Emulator { static const string Name = "higan"; - static const string Version = "106.22"; + static const string Version = "106.23"; static const string Author = "byuu"; static const string License = "GPLv3"; static const string Website = "https://byuu.org/"; diff --git a/higan/systems/Super Famicom.sys/manifest.bml b/higan/systems/Super Famicom.sys/manifest.bml index d296b492..67666905 100644 --- a/higan/systems/Super Famicom.sys/manifest.bml +++ b/higan/systems/Super Famicom.sys/manifest.bml @@ -4,7 +4,7 @@ system name:Super Famicom smp rom name=ipl.rom size=64 ppu1 version=1 - ram name=video.ram size=0x8000 volatile + ram name=video.ram size=0x10000 volatile ram name=object.ram size=544 volatile ppu2 version=3 ram name=palette.ram size=512 volatile diff --git a/higan/target-bsnes/GNUmakefile b/higan/target-bsnes/GNUmakefile index 5fb64dab..0c4e1386 100644 --- a/higan/target-bsnes/GNUmakefile +++ b/higan/target-bsnes/GNUmakefile @@ -5,7 +5,7 @@ include sfc/GNUmakefile include gb/GNUmakefile include processor/GNUmakefile -ui_objects := ui-bsnes ui-program ui-presentation +ui_objects := ui-bsnes ui-program ui-input ui-presentation ui-settings ui_objects += ruby hiro ui_objects += $(if $(call streq,$(platform),windows),ui-resource) @@ -39,7 +39,9 @@ obj/hiro.o: ../hiro/hiro.cpp $(call rwildcard,../hiro/) obj/ui-bsnes.o: $(ui)/bsnes.cpp $(call rwildcard,$(ui)/) obj/ui-program.o: $(ui)/program/program.cpp $(call rwildcard,$(ui)/) +obj/ui-input.o: $(ui)/input/input.cpp $(call rwildcard,$(ui)/) obj/ui-presentation.o: $(ui)/presentation/presentation.cpp $(call rwildcard,$(ui)/) +obj/ui-settings.o: $(ui)/settings/settings.cpp $(call rwildcard,$(ui)/) obj/ui-resource.o: $(windres) data/bsnes.rc obj/ui-resource.o diff --git a/higan/target-bsnes/bsnes.cpp b/higan/target-bsnes/bsnes.cpp index df2af779..13278d93 100644 --- a/higan/target-bsnes/bsnes.cpp +++ b/higan/target-bsnes/bsnes.cpp @@ -1,8 +1,9 @@ #include "bsnes.hpp" +#include unique_pointer