adapt frontend util and build system changes

RSDuck · Jan 26, 2021 · caf4ce1 · caf4ce1
1 parent d4b7e5c
commit caf4ce1
Show file tree

Hide file tree

Showing 6 changed files with 206 additions and 179 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -127,6 +127,8 @@ if (ENABLE_OGLRENDERER)
 else()
 	if (WIN32)
 		target_link_libraries(core ole32 comctl32 ws2_32)
+	elseif (SWITCH)
+		target_link_libraries(core)
 	else()
 		target_link_libraries(core rt)
 	endif()

diff --git a/src/frontend/switch/Platform.cpp b/src/frontend/switch/Platform.cpp
@@ -62,10 +62,14 @@ void ThreadEntry(void* param)
 
 #define STACK_SIZE (1024 * 1024 * 4)
 
+int nextCore = 0;
+
 Thread* Thread_Create(void (*func)())
 {
     ::Thread* thread = new ::Thread();
-    threadCreate(thread, ThreadEntry, (void*)func, NULL, STACK_SIZE, 0x1F, 2);
+    threadCreate(thread, ThreadEntry, (void*)func, NULL, STACK_SIZE, 0x1F, nextCore);
+    // this relies on the order of thread creation, very bad
+    nextCore = 2;
     threadStart(thread);
     return (Thread*)thread;
 }

diff --git a/src/frontend/switch/PlatformConfig.cpp b/src/frontend/switch/PlatformConfig.cpp
@@ -16,6 +16,8 @@ int ScreenSwap;
 int ScreenSizing;
 int Filtering;
 int IntegerScaling;
+int ScreenAspectTop;
+int ScreenAspectBot;
 
 int SavestateRelocSRAM;
 
@@ -49,12 +51,14 @@ ConfigEntry PlatformConfigFile[] =
     {"ScreenSizing",            0, &ScreenSizing,           0, NULL, 0},
     {"Filtering",               0, &Filtering,              1, NULL, 0},
     {"IntegerScaling",          0, &IntegerScaling,         0, NULL, 0},
-
-    {"LastROMPath0",            1, LastROMPath[0],            0, "",   511},
-    {"LastROMPath1",            1, LastROMPath[1],            0, "",   511},
-    {"LastROMPath2",            1, LastROMPath[2],            0, "",   511},
-    {"LastROMPath3",            1, LastROMPath[3],            0, "",   511},
-    {"LastROMPath4",            1, LastROMPath[4],            0, "",   511},
+    {"ScreenAspectTop",         0, &ScreenAspectTop,        0, NULL, 0},
+    {"ScreenAspectBot",         0, &ScreenAspectBot,        0, NULL, 0},
+
+    {"LastROMPath0",            1, LastROMPath[0],          0, "",   511},
+    {"LastROMPath1",            1, LastROMPath[1],          0, "",   511},
+    {"LastROMPath2",            1, LastROMPath[2],          0, "",   511},
+    {"LastROMPath3",            1, LastROMPath[3],          0, "",   511},
+    {"LastROMPath4",            1, LastROMPath[4],          0, "",   511},
 
     {"LastROMFolder",           1, LastROMFolder,           0, "/", 511},
 

diff --git a/src/frontend/switch/PlatformConfig.h b/src/frontend/switch/PlatformConfig.h
@@ -19,6 +19,8 @@ extern int ScreenSwap;
 extern int ScreenSizing;
 extern int Filtering;
 extern int IntegerScaling;
+extern int ScreenAspectTop;
+extern int ScreenAspectBot;
 
 extern char LastROMPath[5][512];
 

diff --git a/src/frontend/switch/SettingsDialog.cpp b/src/frontend/switch/SettingsDialog.cpp
@@ -328,9 +328,11 @@ void DoGui(BoxGui::Frame& parent)
             SectionHeader(settingsFrame, settingsSkewer, "Screens");
 
             DoCombobox(settingsFrame, settingsSkewer, "Rotation", "0°\090°\000180°\000270°\0", Config::ScreenRotation, true);
-            DoCombobox(settingsFrame, settingsSkewer, "Sizing", "Even\0Emphasise top\0Emphasise bottom\0Auto\0", Config::ScreenSizing);
+            DoCombobox(settingsFrame, settingsSkewer, "Sizing", "Even\0Emphasise top\0Emphasise bottom\0Auto\0Top only\0Bottom only\0", Config::ScreenSizing);
             DoCombobox(settingsFrame, settingsSkewer, "Gap", "0px\0001px\08px\00064px\090px\000128px\0", Config::ScreenGap);
-            DoCombobox(settingsFrame, settingsSkewer, "Layout", "Natural\0Vertical\0Horizontal\0", Config::ScreenLayout);
+            DoCombobox(settingsFrame, settingsSkewer, "Layout", "Natural\0Vertical\0Horizontal\0Hybrid\0", Config::ScreenLayout);
+            DoCombobox(settingsFrame, settingsSkewer, "Aspect ratio top", "4:3 (native)\00016:9\0", Config::ScreenAspectTop);
+            DoCombobox(settingsFrame, settingsSkewer, "Aspect ratio bottom", "4:3 (native)\00016:9\0", Config::ScreenAspectBot);
             bool screenSwap = Config::ScreenSwap;
             DoCheckbox(settingsFrame, settingsSkewer, "Swap screens", screenSwap);
             Config::ScreenSwap = screenSwap;