From b8b335f67d7e2b848fee2cc3911ff7a2430c042d Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Thu, 19 Mar 2020 21:46:42 -0400 Subject: [PATCH] Exposes the Master System's region for SDL selection. --- Analyser/Static/Macintosh/Target.hpp | 1 + Analyser/Static/Sega/Target.hpp | 15 +++++++++++---- .../xcschemes/Clock Signal Kiosk.xcscheme | 12 ++++++++---- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Analyser/Static/Macintosh/Target.hpp b/Analyser/Static/Macintosh/Target.hpp index 905739429..243ccf36e 100644 --- a/Analyser/Static/Macintosh/Target.hpp +++ b/Analyser/Static/Macintosh/Target.hpp @@ -11,6 +11,7 @@ #include "../../../Reflection/Enum.h" #include "../../../Reflection/Struct.h" +#include "../StaticAnalyser.hpp" namespace Analyser { namespace Static { diff --git a/Analyser/Static/Sega/Target.hpp b/Analyser/Static/Sega/Target.hpp index 1735704ed..f0926d689 100644 --- a/Analyser/Static/Sega/Target.hpp +++ b/Analyser/Static/Sega/Target.hpp @@ -9,25 +9,27 @@ #ifndef Analyser_Static_Sega_Target_h #define Analyser_Static_Sega_Target_h +#include "../../../Reflection/Enum.h" +#include "../../../Reflection/Struct.h" #include "../StaticAnalyser.hpp" namespace Analyser { namespace Static { namespace Sega { -struct Target: public Analyser::Static::Target { +struct Target: public Analyser::Static::Target, public Reflection::StructImpl { enum class Model { SG1000, MasterSystem, MasterSystem2, }; - enum class Region { + ReflectableEnum(Region, Japan, USA, Europe, Brazil - }; + ); enum class PagingScheme { Sega, @@ -38,7 +40,12 @@ struct Target: public Analyser::Static::Target { Region region = Region::Japan; PagingScheme paging_scheme = PagingScheme::Sega; - Target() : Analyser::Static::Target(Machine::MasterSystem) {} + Target() : Analyser::Static::Target(Machine::MasterSystem) { + if(needs_declare()) { + DeclareField(region); + AnnounceEnum(Region); + } + } }; #define is_master_system(v) v >= Analyser::Static::Sega::Target::Model::MasterSystem diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme index 1e872a546..66ee95aed 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme +++ b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme @@ -66,7 +66,11 @@ + isEnabled = "YES"> + + + isEnabled = "NO"> + isEnabled = "NO"> + isEnabled = "YES">