mirror of
				https://github.com/libretro/Lakka-LibreELEC.git
				synced 2025-11-04 04:28:54 +00:00 
			
		
		
		
	* Switch: Minor kernel config update
* fat32-boot: Attempt to fix umounting flash partition to prevent possible corruption on reboot
* Switch: Bootloader: Fix mistake in boot.txt that wasnt properly setting up dvfsb stuff
* Switch: Add user for retroarch to run as
* Busybox: Fix writing flash partition when using fat32-boot option to give all users write access
* Audio: Pulseaudio-configs: Minor updates for use when running apps as non root user
* Switch: Finalize changes so for running as non root user.
* Retroarch: Revert broken WAR in retroarch-config script
* Switch: Fix default retroarch config, to work out of box with new user
* Fix retroarch controller configs for switch, and add line to fix it to the update.sh file
* Add back missing lite gamepad config, which got lost in a rebase somewhere
* Retroarch: Start Reworking Switch Clocks
* Switch: Bump switch specific package versions, and add changes needed to make built in lakka clock speed menu work properly. Also hide gamemode.
* Retroarch: add patch to remove game mode from menu to all builds
* Switch: dont enable overclock by default
* sort
* Sort me.
* Switch: Drop old flycast from switch build in favor of newer core.
This has some issues with some games showing artifact bars using vulkan renderer,
but also fixes a lot of issues. As a work around to this issue, users can set opengl renderer, and the bars will not be there.
* More to sort
* Fix CEC stuff
* Fix dock audio switching with new user config
* WIP: GPU Clocks
* sort
* fix quotes
* Add working single joycon configs
* Update Switch Joycond to latest
* Switch: Retroarch: add bluetooth ertm disable, and add patch to fix l2cap kernel hang
* Switch: Update image stuff, so kernel reflects Lakka/Libreelec kernel makes in uimage header, and re-arange some things to make them global
* Switch: Linux: Enable Xpad Driver for wired xbox controllers
* Switch: More xpadneo stuff
This should at a minimum fix issues with Xbox One S controllers
8bitdo and GuliKit KingKong Controller families will probably need more
hid-core patching to redirect them to this driver for support.
Also, when 0.10 version of Xpadneo is released, It will stop building due to kernel not having this patch:
f07b3c1da9
When the time comes, this will need to be looked into.
* xpadneo: update package
* Switch: Update U-Boot to Switchroot 2023-NX03 version
* Switch: Update kernel to Switchroot 5.1.0
* Switch: Create Singular switch-bsp Package
This package consolodates the switch specific configs into one package,
as this feels cleaner, and easier to deal with later, if/when needed.
This package combines the switch-alsa-ucm and switch-bluetooth-dock stuff
into one package.
---------
Co-authored-by: Tomáš Kelemen (vudiq) <vudiq@vudiq.sk>
		
	
		
			
				
	
	
		
			2125 lines
		
	
	
		
			62 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			2125 lines
		
	
	
		
			62 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From 5be42eaddbc5725a39eff275bec097f9eee3da7f Mon Sep 17 00:00:00 2001
 | 
						||
From: Ronald Brown <rbrown4014@yahoo.com>
 | 
						||
Date: Mon, 30 Jan 2023 08:05:50 -0800
 | 
						||
Subject: [PATCH 1/7] Lakka-Switch: Decouple from LibNX Builds
 | 
						||
 | 
						||
---
 | 
						||
 intl/msg_hash_ar.h                | 15 ++-----
 | 
						||
 intl/msg_hash_ast.h               |  7 ++--
 | 
						||
 intl/msg_hash_ca.h                | 15 ++-----
 | 
						||
 intl/msg_hash_chs.h               | 15 ++-----
 | 
						||
 intl/msg_hash_cht.h               | 15 ++-----
 | 
						||
 intl/msg_hash_cs.h                | 15 ++-----
 | 
						||
 intl/msg_hash_cy.h                |  6 +--
 | 
						||
 intl/msg_hash_da.h                |  6 +--
 | 
						||
 intl/msg_hash_de.h                | 14 ++-----
 | 
						||
 intl/msg_hash_el.h                | 15 ++-----
 | 
						||
 intl/msg_hash_en.h                | 14 ++-----
 | 
						||
 intl/msg_hash_eo.h                |  7 ++--
 | 
						||
 intl/msg_hash_es.h                | 15 ++-----
 | 
						||
 intl/msg_hash_fa.h                |  6 +--
 | 
						||
 intl/msg_hash_fi.h                | 15 ++-----
 | 
						||
 intl/msg_hash_fr.h                | 15 ++-----
 | 
						||
 intl/msg_hash_gl.h                |  7 ++--
 | 
						||
 intl/msg_hash_he.h                |  6 +--
 | 
						||
 intl/msg_hash_hr.h                |  6 +--
 | 
						||
 intl/msg_hash_hu.h                | 15 ++-----
 | 
						||
 intl/msg_hash_id.h                | 15 ++-----
 | 
						||
 intl/msg_hash_it.h                | 15 ++-----
 | 
						||
 intl/msg_hash_ja.h                | 15 ++-----
 | 
						||
 intl/msg_hash_ko.h                | 14 ++-----
 | 
						||
 intl/msg_hash_lbl.h               |  8 +---
 | 
						||
 intl/msg_hash_mt.h                |  7 ++--
 | 
						||
 intl/msg_hash_nl.h                |  7 ++--
 | 
						||
 intl/msg_hash_no.h                |  7 ++--
 | 
						||
 intl/msg_hash_oc.h                |  6 +--
 | 
						||
 intl/msg_hash_pl.h                | 15 ++-----
 | 
						||
 intl/msg_hash_pt_br.h             | 15 ++-----
 | 
						||
 intl/msg_hash_pt_pt.h             |  6 +--
 | 
						||
 intl/msg_hash_ro.h                |  6 +--
 | 
						||
 intl/msg_hash_ru.h                | 15 ++-----
 | 
						||
 intl/msg_hash_si.h                |  6 +--
 | 
						||
 intl/msg_hash_sk.h                | 15 ++-----
 | 
						||
 intl/msg_hash_sr.h                |  6 +--
 | 
						||
 intl/msg_hash_sv.h                |  6 +--
 | 
						||
 intl/msg_hash_tr.h                | 15 ++-----
 | 
						||
 intl/msg_hash_uk.h                | 10 ++---
 | 
						||
 intl/msg_hash_us.h                | 15 ++-----
 | 
						||
 intl/msg_hash_val.h               |  6 +--
 | 
						||
 intl/msg_hash_vn.h                |  6 +--
 | 
						||
 menu/cbs/menu_cbs_deferred_push.c | 11 +-----
 | 
						||
 menu/cbs/menu_cbs_get_value.c     |  4 --
 | 
						||
 menu/cbs/menu_cbs_left.c          |  4 --
 | 
						||
 menu/cbs/menu_cbs_ok.c            | 53 +++----------------------
 | 
						||
 menu/cbs/menu_cbs_right.c         |  5 +--
 | 
						||
 menu/cbs/menu_cbs_sublabel.c      | 18 ++-------
 | 
						||
 menu/cbs/menu_cbs_title.c         | 19 ++-------
 | 
						||
 menu/drivers/ozone.c              | 15 +------
 | 
						||
 menu/drivers/xmb.c                | 16 +-------
 | 
						||
 menu/menu_displaylist.c           | 65 ++-----------------------------
 | 
						||
 menu/menu_displaylist.h           |  5 +--
 | 
						||
 menu/menu_driver.c                |  7 ----
 | 
						||
 menu/menu_driver.h                |  5 +--
 | 
						||
 menu/menu_setting.c               | 17 ++------
 | 
						||
 retroarch.c                       |  7 ----
 | 
						||
 runloop.c                         |  7 ----
 | 
						||
 switch_performance_profiles.h     | 62 +----------------------------
 | 
						||
 60 files changed, 153 insertions(+), 632 deletions(-)
 | 
						||
 | 
						||
diff --git a/intl/msg_hash_ar.h b/intl/msg_hash_ar.h
 | 
						||
index 875e477cf0..6c2b8233ab 100644
 | 
						||
--- a/intl/msg_hash_ar.h
 | 
						||
+++ b/intl/msg_hash_ar.h
 | 
						||
@@ -9264,18 +9264,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_BLOCK_TIMEOUT,
 | 
						||
    "مهلة كتلة الإدخال"
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "GPU فوق الساعة"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "تبديل GPU على مدار الساعة أو تحت الساعة."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "تجاوز الساعة المعالج"
 | 
						||
@@ -9347,6 +9336,8 @@ MSG_HASH(
 | 
						||
    "ملف تكوين خاطئ - تعذر العثور على APNAME أو PASSWORD في %s"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_ast.h b/intl/msg_hash_ast.h
 | 
						||
index 2781f26877..46d59a710e 100644
 | 
						||
--- a/intl/msg_hash_ast.h
 | 
						||
+++ b/intl/msg_hash_ast.h
 | 
						||
@@ -3740,10 +3740,7 @@ MSG_HASH(
 | 
						||
    MSG_READ_ONLY,
 | 
						||
    "Estáu del almacenamientu internu: namás llectura"
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 MSG_HASH(
 | 
						||
@@ -3779,6 +3776,8 @@ MSG_HASH(
 | 
						||
    "El ficheru de configuración ye incorreutu - nun se pudo atopar APNAME o PASSWORD en %s"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_ca.h b/intl/msg_hash_ca.h
 | 
						||
index b8d6f64940..e77761f933 100644
 | 
						||
--- a/intl/msg_hash_ca.h
 | 
						||
+++ b/intl/msg_hash_ca.h
 | 
						||
@@ -8060,18 +8060,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_SUBLABEL_BRIGHTNESS_CONTROL,
 | 
						||
    "Augmenta o redueix la brillantor de la pantalla."
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "Força la GPU"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "Augmenta o redueix la velocitat de rellotge de la GPU de la Switch."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "Força la CPU"
 | 
						||
@@ -8155,6 +8144,8 @@ MSG_HASH(
 | 
						||
    "Fitxer de configuració erroni — no s’han trobat APNAME ni PASSWORD a %s"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h
 | 
						||
index dab028f818..5ef30de62f 100644
 | 
						||
--- a/intl/msg_hash_chs.h
 | 
						||
+++ b/intl/msg_hash_chs.h
 | 
						||
@@ -12404,18 +12404,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_SUBLABEL_BRIGHTNESS_CONTROL,
 | 
						||
    "提高或降低屏幕亮度。"
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "GPU 超频"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "超频或降频 Switch 的 GPU。"
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "CPU 超频"
 | 
						||
@@ -12503,6 +12492,8 @@ MSG_HASH(
 | 
						||
    "错误配置文件——在 %s 中找不到 APNAME 或 PASSWORD"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_cht.h b/intl/msg_hash_cht.h
 | 
						||
index 64c8dc53dc..a6b16defa5 100644
 | 
						||
--- a/intl/msg_hash_cht.h
 | 
						||
+++ b/intl/msg_hash_cht.h
 | 
						||
@@ -14316,18 +14316,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_SUBLABEL_BRIGHTNESS_CONTROL,
 | 
						||
    "調整螢幕亮度。"
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "GPU 超頻"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "Switch 圖形處理器超頻設定。"
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "CPU 超頻"
 | 
						||
@@ -14423,6 +14412,8 @@ MSG_HASH(
 | 
						||
    "錯誤的設定檔 - 遺失名稱或密碼 %s"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_cs.h b/intl/msg_hash_cs.h
 | 
						||
index a83dd55429..b19c4c0555 100644
 | 
						||
--- a/intl/msg_hash_cs.h
 | 
						||
+++ b/intl/msg_hash_cs.h
 | 
						||
@@ -13892,18 +13892,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_SUBLABEL_BRIGHTNESS_CONTROL,
 | 
						||
    "Zvýšení Nebo Snížení Jasu Obrazovky."
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "Přetaktování GPU"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "Přetaktování nebo podtaktování přepínače grafického procesoru."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "Přetaktování CPU"
 | 
						||
@@ -13991,6 +13980,8 @@ MSG_HASH(
 | 
						||
    "Chybný konfigurační soubor - nepodařilo se najít APNAME nebo HESLO v %s"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_cy.h b/intl/msg_hash_cy.h
 | 
						||
index 930ab1df8d..f42444222f 100644
 | 
						||
--- a/intl/msg_hash_cy.h
 | 
						||
+++ b/intl/msg_hash_cy.h
 | 
						||
@@ -1724,13 +1724,11 @@ MSG_HASH(
 | 
						||
    MSG_LOCAL,
 | 
						||
    "Lleol"
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_da.h b/intl/msg_hash_da.h
 | 
						||
index 2ef2c51845..c131c79b4d 100644
 | 
						||
--- a/intl/msg_hash_da.h
 | 
						||
+++ b/intl/msg_hash_da.h
 | 
						||
@@ -1457,12 +1457,12 @@ MSG_HASH(
 | 
						||
    "Genstart RetroArch"
 | 
						||
    )
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h
 | 
						||
index 7a4da841e1..fe9a249523 100644
 | 
						||
--- a/intl/msg_hash_de.h
 | 
						||
+++ b/intl/msg_hash_de.h
 | 
						||
@@ -13781,17 +13781,7 @@ MSG_HASH(
 | 
						||
    "Bildschirmhelligkeit erhöhen oder verringern."
 | 
						||
    )
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "GPU Übertakten"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "Über- oder Untertakten der Switch GPU."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "CPU Übertakten"
 | 
						||
@@ -13887,6 +13877,8 @@ MSG_HASH(
 | 
						||
    "Falsche Konfigurationsdatei - APNAME oder PASSWORD in %s nicht gefunden"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_el.h b/intl/msg_hash_el.h
 | 
						||
index d7015b1ae7..7609fa5f8f 100644
 | 
						||
--- a/intl/msg_hash_el.h
 | 
						||
+++ b/intl/msg_hash_el.h
 | 
						||
@@ -5600,18 +5600,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_BRIGHTNESS_CONTROL,
 | 
						||
    "Φωτεινότητα Οθόνης"
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "Υπερχρονισμός Κάρτας Γραφικών"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "Υπερχρονισμός ή υποχρονισμός της Κάρτας Γραφικών του Switch."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "Υπερχρονισμός Επεξεργαστή"
 | 
						||
@@ -5659,6 +5648,8 @@ MSG_HASH(
 | 
						||
    "Επιλέξτε τη ζώνη ώρας σας για να προσαρμόσετε την ημερομηνία και την ώρα στην τοποθεσία σας."
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_en.h b/intl/msg_hash_en.h
 | 
						||
index 5bea597830..428b700e1a 100644
 | 
						||
--- a/intl/msg_hash_en.h
 | 
						||
+++ b/intl/msg_hash_en.h
 | 
						||
@@ -2169,17 +2169,7 @@ MSG_HASH(
 | 
						||
    "Use the lowest frequency available to save power. Useful on battery powered devices, but performance will be significantly reduced."
 | 
						||
    )
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "GPU Over-clock"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "Over-clock or under-clock the Switch GPU."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "CPU Over-clock"
 | 
						||
@@ -2191,6 +2181,8 @@ MSG_HASH(
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_SUBLABEL_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h
 | 
						||
index f9dfec057a..62d7077fa4 100644
 | 
						||
--- a/intl/msg_hash_eo.h
 | 
						||
+++ b/intl/msg_hash_eo.h
 | 
						||
@@ -1000,10 +1000,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_SMALL_KEYBOARD_ENABLE,
 | 
						||
    "Small Keyboard Enable"
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 MSG_HASH(
 | 
						||
@@ -1027,6 +1024,8 @@ MSG_HASH(
 | 
						||
    "Enable or disable remote command line access."
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_es.h b/intl/msg_hash_es.h
 | 
						||
index a90b3d279b..56769dea95 100644
 | 
						||
--- a/intl/msg_hash_es.h
 | 
						||
+++ b/intl/msg_hash_es.h
 | 
						||
@@ -14104,18 +14104,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_SUBLABEL_BRIGHTNESS_CONTROL,
 | 
						||
    "Aumenta o reduce el brillo de la pantalla."
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "Acelerar GPU"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "Aumenta o reduce la velocidad de la GPU de Switch."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "Acelerar CPU"
 | 
						||
@@ -14207,6 +14196,8 @@ MSG_HASH(
 | 
						||
    "Archivo de configuración incorrecto: no se encontraron los valores APNAME o PASSWORD en %s"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_fa.h b/intl/msg_hash_fa.h
 | 
						||
index 4c3df6c550..a6196a5bfa 100644
 | 
						||
--- a/intl/msg_hash_fa.h
 | 
						||
+++ b/intl/msg_hash_fa.h
 | 
						||
@@ -2661,9 +2661,7 @@ MSG_HASH(
 | 
						||
    "ریستارت رتروآرچ"
 | 
						||
    )
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 MSG_HASH(
 | 
						||
@@ -2671,6 +2669,8 @@ MSG_HASH(
 | 
						||
    "بلوتوث"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_fi.h b/intl/msg_hash_fi.h
 | 
						||
index df1af3b122..1e7d57d34e 100644
 | 
						||
--- a/intl/msg_hash_fi.h
 | 
						||
+++ b/intl/msg_hash_fi.h
 | 
						||
@@ -13144,18 +13144,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_SUBLABEL_BRIGHTNESS_CONTROL,
 | 
						||
    "Lisää tai vähennä näytön kirkkautta."
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "Näytönohjaimen ylikellotus"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "Ylikellota tai alikellota Switchin näytönohjain."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "Suorittimen ylikellotus"
 | 
						||
@@ -13239,6 +13228,8 @@ MSG_HASH(
 | 
						||
    "Väärä kokoonpanotiedosto- APNAME tai PASSWORD ei löydy kohteesta %s"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h
 | 
						||
index 21f5f0a517..6bc5d61714 100644
 | 
						||
--- a/intl/msg_hash_fr.h
 | 
						||
+++ b/intl/msg_hash_fr.h
 | 
						||
@@ -14056,18 +14056,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_SUBLABEL_BRIGHTNESS_CONTROL,
 | 
						||
    "Augmenter ou diminuer la luminosité de l'écran."
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "Overclocker le processeur graphique"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "Overclocker ou underclocker le processeur graphique de la Switch."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "Overclocker le processeur"
 | 
						||
@@ -14151,6 +14140,8 @@ MSG_HASH(
 | 
						||
    "Mauvais fichier de configuration - impossible de trouver l'APNAME ou le PASSWORD dans %s"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_gl.h b/intl/msg_hash_gl.h
 | 
						||
index e47d0bbc3b..789c8d2092 100644
 | 
						||
--- a/intl/msg_hash_gl.h
 | 
						||
+++ b/intl/msg_hash_gl.h
 | 
						||
@@ -2176,10 +2176,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_META_RESTART_KEY,
 | 
						||
    "Reiniciar RetroArch"
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 MSG_HASH(
 | 
						||
@@ -2207,6 +2204,8 @@ MSG_HASH(
 | 
						||
    "Desconectando da wifi \"%s\""
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_he.h b/intl/msg_hash_he.h
 | 
						||
index e82ba0fb29..681ad0011b 100644
 | 
						||
--- a/intl/msg_hash_he.h
 | 
						||
+++ b/intl/msg_hash_he.h
 | 
						||
@@ -901,12 +901,12 @@ MSG_HASH(
 | 
						||
    "אתחול RetroArch"
 | 
						||
    )
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_hr.h b/intl/msg_hash_hr.h
 | 
						||
index c91d3b9636..edb20cad99 100644
 | 
						||
--- a/intl/msg_hash_hr.h
 | 
						||
+++ b/intl/msg_hash_hr.h
 | 
						||
@@ -1105,12 +1105,12 @@ MSG_HASH(
 | 
						||
    "Ponovno pokreni RetroArch"
 | 
						||
    )
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_hu.h b/intl/msg_hash_hu.h
 | 
						||
index 90dabd53d5..38d85eb99b 100644
 | 
						||
--- a/intl/msg_hash_hu.h
 | 
						||
+++ b/intl/msg_hash_hu.h
 | 
						||
@@ -13872,18 +13872,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_SUBLABEL_BRIGHTNESS_CONTROL,
 | 
						||
    "A kijelző fényerejének növelése vagy csökkentése."
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "GPU túlhajtás"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "A Switch GPU-jának túlhajtása vagy visszafogása."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "CPU túlhajtás"
 | 
						||
@@ -13971,6 +13960,8 @@ MSG_HASH(
 | 
						||
    "Rossz konfigurációs fájl - nincs APNAME vagy PASSWORD itt: %s"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_id.h b/intl/msg_hash_id.h
 | 
						||
index 6daa5030b8..45c15cbb0e 100644
 | 
						||
--- a/intl/msg_hash_id.h
 | 
						||
+++ b/intl/msg_hash_id.h
 | 
						||
@@ -3896,18 +3896,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE,
 | 
						||
    "Jenis Pemetaan Stik Kendali Papan Ketik"
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "Percepatan GPU"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "Mempercepat atau perlambat GPU permainan Switch."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "Percepatan CPU"
 | 
						||
@@ -3923,6 +3912,8 @@ MSG_HASH(
 | 
						||
    "Memutus sambungan dari Wi-Fi '%s'"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h
 | 
						||
index 979b52b9f0..87a691802c 100644
 | 
						||
--- a/intl/msg_hash_it.h
 | 
						||
+++ b/intl/msg_hash_it.h
 | 
						||
@@ -13936,18 +13936,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_SUBLABEL_BRIGHTNESS_CONTROL,
 | 
						||
    "Aumenta o diminuisce la luminosità dello schermo."
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "Overclocca la GPU"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "Overclocca o underclocca la GPU del Nintendo Switch."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "Overclocca la CPU"
 | 
						||
@@ -14043,6 +14032,8 @@ MSG_HASH(
 | 
						||
    "File di configurazione errato: impossibile trovare APNAME o PASSWORD in %s"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h
 | 
						||
index 32453e4265..7b1966993e 100644
 | 
						||
--- a/intl/msg_hash_ja.h
 | 
						||
+++ b/intl/msg_hash_ja.h
 | 
						||
@@ -11140,18 +11140,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_SUBLABEL_BRIGHTNESS_CONTROL,
 | 
						||
    "画面の明るさを増減します."
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "GPUオーバークロック"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "SwitchのGPUをオーバークロック/アンダークロックします."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "CPUオーバークロック"
 | 
						||
@@ -11243,6 +11232,8 @@ MSG_HASH(
 | 
						||
    "設定ファイルが不正です - APNAME または PASSWORD が %s に見つかりませんでした"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h
 | 
						||
index 3458d87bd6..1178a67148 100644
 | 
						||
--- a/intl/msg_hash_ko.h
 | 
						||
+++ b/intl/msg_hash_ko.h
 | 
						||
@@ -13917,17 +13917,7 @@ MSG_HASH(
 | 
						||
    "화면의 밝기를 조절합니다."
 | 
						||
    )
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "GPU 오버클럭"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "스위치 GPU를 오버클럭 또는 언더클럭합니다."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "CPU 오버클럭"
 | 
						||
@@ -14027,6 +14017,8 @@ MSG_HASH(
 | 
						||
    "잘못된 구성 파일 - %s에서 APNAME 또는 PASSWORD를 찾을 수 없습니다."
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h
 | 
						||
index 4befe929b8..fbc3326315 100644
 | 
						||
--- a/intl/msg_hash_lbl.h
 | 
						||
+++ b/intl/msg_hash_lbl.h
 | 
						||
@@ -1,10 +1,4 @@
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "switch_gpu_profile"
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_SWITCH_CPU_PROFILE,
 | 
						||
    "switch_cpu_profile"
 | 
						||
diff --git a/intl/msg_hash_mt.h b/intl/msg_hash_mt.h
 | 
						||
index b664b5466d..a9ea62a81f 100644
 | 
						||
--- a/intl/msg_hash_mt.h
 | 
						||
+++ b/intl/msg_hash_mt.h
 | 
						||
@@ -424,13 +424,12 @@
 | 
						||
 
 | 
						||
 /* Environment Specific Settings */
 | 
						||
 
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h
 | 
						||
index e4029b2f94..66496c97ba 100644
 | 
						||
--- a/intl/msg_hash_nl.h
 | 
						||
+++ b/intl/msg_hash_nl.h
 | 
						||
@@ -6168,10 +6168,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_SMALL_KEYBOARD_ENABLE,
 | 
						||
    "Small Keyboard Enable"
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 MSG_HASH(
 | 
						||
@@ -6195,6 +6192,8 @@ MSG_HASH(
 | 
						||
    "Enable or disable remote command line access."
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_no.h b/intl/msg_hash_no.h
 | 
						||
index 521bdb4bf8..31e81cb755 100644
 | 
						||
--- a/intl/msg_hash_no.h
 | 
						||
+++ b/intl/msg_hash_no.h
 | 
						||
@@ -2468,13 +2468,12 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_META_RESTART_KEY,
 | 
						||
    "Start RetroArch på nytt"
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_oc.h b/intl/msg_hash_oc.h
 | 
						||
index 45566d228d..5c04be6f4d 100644
 | 
						||
--- a/intl/msg_hash_oc.h
 | 
						||
+++ b/intl/msg_hash_oc.h
 | 
						||
@@ -668,13 +668,11 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_META_RESTART_KEY,
 | 
						||
    "Reaviar RetroArch"
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_pl.h b/intl/msg_hash_pl.h
 | 
						||
index e73ec8fcd0..e84e8fa2ab 100644
 | 
						||
--- a/intl/msg_hash_pl.h
 | 
						||
+++ b/intl/msg_hash_pl.h
 | 
						||
@@ -12720,18 +12720,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_SUBLABEL_BRIGHTNESS_CONTROL,
 | 
						||
    "Zwiększ lub zmniejsz jasność ekranu."
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "Podkręcanie GPU"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "Podkręcanie lub obniżanie GPU."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "Podkręcanie CPU"
 | 
						||
@@ -12827,6 +12816,8 @@ MSG_HASH(
 | 
						||
    "Niepoprawny plik konfiguracyjny - nie można znaleźć APNAME lub PASSWORD w %s"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h
 | 
						||
index 982a3d072d..8b7443e1f6 100644
 | 
						||
--- a/intl/msg_hash_pt_br.h
 | 
						||
+++ b/intl/msg_hash_pt_br.h
 | 
						||
@@ -12940,18 +12940,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_SUBLABEL_BRIGHTNESS_CONTROL,
 | 
						||
    "Aumenta ou diminui o brilho da tela."
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "Overclock da GPU"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "Faz um overclock ou underclock na CPU do Switch."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "Overclock da CPU"
 | 
						||
@@ -13047,6 +13036,8 @@ MSG_HASH(
 | 
						||
    "Arquivo de configuração incorreto: valores APNAME ou PASSWORD não puderam ser encontrados em %s"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_pt_pt.h b/intl/msg_hash_pt_pt.h
 | 
						||
index 801c17f706..99fd58354e 100644
 | 
						||
--- a/intl/msg_hash_pt_pt.h
 | 
						||
+++ b/intl/msg_hash_pt_pt.h
 | 
						||
@@ -5201,9 +5201,7 @@ MSG_HASH(
 | 
						||
    "Ativar teclado pequeno"
 | 
						||
    )
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 MSG_HASH(
 | 
						||
@@ -5235,6 +5233,8 @@ MSG_HASH(
 | 
						||
    "Ativar/desativar acesso remoto pela linha de comandos."
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_ro.h b/intl/msg_hash_ro.h
 | 
						||
index b664b5466d..c4d8f7a0a3 100644
 | 
						||
--- a/intl/msg_hash_ro.h
 | 
						||
+++ b/intl/msg_hash_ro.h
 | 
						||
@@ -425,12 +425,12 @@
 | 
						||
 /* Environment Specific Settings */
 | 
						||
 
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h
 | 
						||
index 25d722fbf4..636b461723 100644
 | 
						||
--- a/intl/msg_hash_ru.h
 | 
						||
+++ b/intl/msg_hash_ru.h
 | 
						||
@@ -14088,18 +14088,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_SUBLABEL_BRIGHTNESS_CONTROL,
 | 
						||
    "Увеличить или уменьшить яркость экрана."
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "Разгон GPU"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "Разгон или замедление графического процессора Switch."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "Разгон СPU"
 | 
						||
@@ -14187,6 +14176,8 @@ MSG_HASH(
 | 
						||
    "Неправильный файл конфигурации - отсутствует APNAME или PASSWORD в %s"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_si.h b/intl/msg_hash_si.h
 | 
						||
index bf9805492f..7a4e20a330 100644
 | 
						||
--- a/intl/msg_hash_si.h
 | 
						||
+++ b/intl/msg_hash_si.h
 | 
						||
@@ -517,12 +517,12 @@ MSG_HASH(
 | 
						||
 /* Environment Specific Settings */
 | 
						||
 
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_sk.h b/intl/msg_hash_sk.h
 | 
						||
index 0149dbec22..04eca74c37 100644
 | 
						||
--- a/intl/msg_hash_sk.h
 | 
						||
+++ b/intl/msg_hash_sk.h
 | 
						||
@@ -5688,18 +5688,7 @@ MSG_HASH(
 | 
						||
    MSG_LOCAL,
 | 
						||
    "Miestne"
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "GPU pretaktovanie"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "Pretaktovanie alebo podtaktovanie GPU Switcha."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "CPU pretaktovanie"
 | 
						||
@@ -5727,6 +5716,8 @@ MSG_HASH(
 | 
						||
    "[Žiadne SSID]"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_sr.h b/intl/msg_hash_sr.h
 | 
						||
index 329a5ed05e..4aaf51c1b4 100644
 | 
						||
--- a/intl/msg_hash_sr.h
 | 
						||
+++ b/intl/msg_hash_sr.h
 | 
						||
@@ -2273,12 +2273,12 @@ MSG_HASH(
 | 
						||
    "Restartuj RetroArch"
 | 
						||
    )
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_sv.h b/intl/msg_hash_sv.h
 | 
						||
index c109b38a3d..cd7458c377 100644
 | 
						||
--- a/intl/msg_hash_sv.h
 | 
						||
+++ b/intl/msg_hash_sv.h
 | 
						||
@@ -3981,9 +3981,7 @@ MSG_HASH(
 | 
						||
    "Lokal"
 | 
						||
    )
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 MSG_HASH(
 | 
						||
@@ -3995,6 +3993,8 @@ MSG_HASH(
 | 
						||
    "Tidszon"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_tr.h b/intl/msg_hash_tr.h
 | 
						||
index 334af2e4d0..81f6573bdf 100644
 | 
						||
--- a/intl/msg_hash_tr.h
 | 
						||
+++ b/intl/msg_hash_tr.h
 | 
						||
@@ -13396,18 +13396,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_SUBLABEL_BRIGHTNESS_CONTROL,
 | 
						||
    "Ekran parlaklığını arttır veya azalt."
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "GPU Hız Aşırtma"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "GPU hızını arttır yada düşür."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "CPU Hız Aşırtma"
 | 
						||
@@ -13491,6 +13480,8 @@ MSG_HASH(
 | 
						||
    "Yanlış yapılandırma dosyası - %s içinde APNAME veya PASSWORD bulunamadı"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_uk.h b/intl/msg_hash_uk.h
 | 
						||
index 097679c62a..b9239b0a75 100644
 | 
						||
--- a/intl/msg_hash_uk.h
 | 
						||
+++ b/intl/msg_hash_uk.h
 | 
						||
@@ -7865,13 +7865,7 @@ MSG_HASH(
 | 
						||
    "Місцеві"
 | 
						||
    )
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "Розгін GPU"
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "Розгін CPU"
 | 
						||
@@ -7903,6 +7897,8 @@ MSG_HASH(
 | 
						||
    "Точка доступу Wi-Fi не запущена"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
 | 
						||
index ea61093f65..85db8480fd 100644
 | 
						||
--- a/intl/msg_hash_us.h
 | 
						||
+++ b/intl/msg_hash_us.h
 | 
						||
@@ -14908,18 +14908,7 @@ MSG_HASH(
 | 
						||
    MENU_ENUM_SUBLABEL_BRIGHTNESS_CONTROL,
 | 
						||
    "Increase or decrease the screen brightness."
 | 
						||
    )
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-   "GPU Overclock"
 | 
						||
-   )
 | 
						||
-MSG_HASH(
 | 
						||
-   MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
 | 
						||
-   "Overclock or underclock the Switch GPU."
 | 
						||
-   )
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
 | 
						||
    "CPU Overclock"
 | 
						||
@@ -15019,6 +15008,8 @@ MSG_HASH(
 | 
						||
    "Wrong configuration file - could not find APNAME or PASSWORD in %s"
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 MSG_HASH(
 | 
						||
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
 | 
						||
diff --git a/intl/msg_hash_val.h b/intl/msg_hash_val.h
 | 
						||
index e8a09b521d..a1d5f5f756 100644
 | 
						||
--- a/intl/msg_hash_val.h
 | 
						||
+++ b/intl/msg_hash_val.h
 | 
						||
@@ -3197,12 +3197,12 @@ MSG_HASH(
 | 
						||
    "Reinicia RetroArch"
 | 
						||
    )
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h
 | 
						||
index 1ce7ba2439..0388691995 100644
 | 
						||
--- a/intl/msg_hash_vn.h
 | 
						||
+++ b/intl/msg_hash_vn.h
 | 
						||
@@ -2609,9 +2609,7 @@ MSG_HASH(
 | 
						||
    "Small Keyboard Enable"
 | 
						||
    )
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 MSG_HASH(
 | 
						||
@@ -2639,6 +2637,8 @@ MSG_HASH(
 | 
						||
    "Bật/tắt giao thức SSH."
 | 
						||
    )
 | 
						||
 #endif
 | 
						||
+#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#endif
 | 
						||
 #ifdef GEKKO
 | 
						||
 #endif
 | 
						||
 #ifdef HAVE_ODROIDGO2
 | 
						||
diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
 | 
						||
index bf89a7dab7..17c53d8758 100644
 | 
						||
--- a/menu/cbs/menu_cbs_deferred_push.c
 | 
						||
+++ b/menu/cbs/menu_cbs_deferred_push.c
 | 
						||
@@ -262,14 +262,10 @@ GENERIC_DEFERRED_PUSH(deferred_push_core_system_files_list,         DISPLAYLIST_
 | 
						||
 GENERIC_DEFERRED_PUSH(deferred_push_lakka_list,                     DISPLAYLIST_LAKKA)
 | 
						||
 #endif
 | 
						||
 
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#if defined(HAVE_LIBNX)
 | 
						||
 GENERIC_DEFERRED_PUSH(deferred_push_switch_cpu_profile,             DISPLAYLIST_SWITCH_CPU_PROFILE)
 | 
						||
 #endif
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-GENERIC_DEFERRED_PUSH(deferred_push_switch_gpu_profile,             DISPLAYLIST_SWITCH_GPU_PROFILE)
 | 
						||
-#endif
 | 
						||
-
 | 
						||
 #if defined(HAVE_LAKKA)
 | 
						||
 GENERIC_DEFERRED_PUSH(deferred_push_cpu_perfpower,                  DISPLAYLIST_CPU_PERFPOWER_LIST)
 | 
						||
 GENERIC_DEFERRED_PUSH(deferred_push_cpu_policy,                     DISPLAYLIST_CPU_POLICY_LIST)
 | 
						||
@@ -786,10 +782,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
 | 
						||
       {MENU_ENUM_LABEL_DEFERRED_AUDIO_RESAMPLER_SETTINGS_LIST, deferred_push_audio_resampler_settings_list},
 | 
						||
       {MENU_ENUM_LABEL_DEFERRED_AUDIO_MIXER_SETTINGS_LIST, deferred_push_audio_mixer_settings_list},
 | 
						||
       {MENU_ENUM_LABEL_DEFERRED_LATENCY_SETTINGS_LIST, deferred_push_latency_settings_list},
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-      {MENU_ENUM_LABEL_SWITCH_GPU_PROFILE, deferred_push_switch_gpu_profile},
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#if  defined(HAVE_LIBNX)
 | 
						||
       {MENU_ENUM_LABEL_SWITCH_CPU_PROFILE, deferred_push_switch_cpu_profile},
 | 
						||
 #endif
 | 
						||
 #if defined(HAVE_LAKKA)
 | 
						||
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
 | 
						||
index 53edd75bf5..c56c106598 100644
 | 
						||
--- a/menu/cbs/menu_cbs_get_value.c
 | 
						||
+++ b/menu/cbs/menu_cbs_get_value.c
 | 
						||
@@ -599,7 +599,6 @@ static void menu_action_setting_disp_set_label_contentless_core(
 | 
						||
       strlcpy(s2, alt, len2);
 | 
						||
 }
 | 
						||
 
 | 
						||
-#ifndef HAVE_LAKKA_SWITCH
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 static void menu_action_setting_disp_cpu_gov_mode(
 | 
						||
       file_list_t* list,
 | 
						||
@@ -764,7 +763,6 @@ static void menu_action_cpu_governor_label(
 | 
						||
    strlcpy(s, d->scaling_governor, len);
 | 
						||
 }
 | 
						||
 #endif
 | 
						||
-#endif
 | 
						||
 
 | 
						||
 static void menu_action_setting_disp_set_label_core_lock(
 | 
						||
       file_list_t* list,
 | 
						||
@@ -2040,7 +2038,6 @@ static int menu_cbs_init_bind_get_string_representation_compare_label(
 | 
						||
             BIND_ACTION_GET_VALUE(cbs,
 | 
						||
                   menu_action_setting_disp_set_label_core_option_override_info);
 | 
						||
             break;
 | 
						||
-         #ifndef HAVE_LAKKA_SWITCH
 | 
						||
          #ifdef HAVE_LAKKA
 | 
						||
          case MENU_ENUM_LABEL_CPU_PERF_MODE:
 | 
						||
             BIND_ACTION_GET_VALUE(cbs,
 | 
						||
@@ -2067,7 +2064,6 @@ static int menu_cbs_init_bind_get_string_representation_compare_label(
 | 
						||
             BIND_ACTION_GET_VALUE(cbs, menu_action_cpu_governor_label);
 | 
						||
             break;
 | 
						||
          #endif
 | 
						||
-         #endif
 | 
						||
          default:
 | 
						||
             return -1;
 | 
						||
       }
 | 
						||
diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
 | 
						||
index b3c7441bfe..d8b8eb1b01 100644
 | 
						||
--- a/menu/cbs/menu_cbs_left.c
 | 
						||
+++ b/menu/cbs/menu_cbs_left.c
 | 
						||
@@ -686,7 +686,6 @@ static int manual_content_scan_core_name_left(unsigned type, const char *label,
 | 
						||
    return 0;
 | 
						||
 }
 | 
						||
 
 | 
						||
-#ifndef HAVE_LAKKA_SWITCH
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 static int cpu_policy_mode_change(unsigned type, const char *label,
 | 
						||
       bool wraparound)
 | 
						||
@@ -801,7 +800,6 @@ static int cpu_policy_freq_tweak(unsigned type, const char *label,
 | 
						||
    return 0;
 | 
						||
 }
 | 
						||
 #endif
 | 
						||
-#endif /* #ifndef HAVE_LAKKA_SWITCH */
 | 
						||
 
 | 
						||
 static int core_setting_left(unsigned type, const char *label,
 | 
						||
       bool wraparound)
 | 
						||
@@ -1115,7 +1113,6 @@ static int menu_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs,
 | 
						||
             case MENU_ENUM_LABEL_MANUAL_CONTENT_SCAN_CORE_NAME:
 | 
						||
                BIND_ACTION_LEFT(cbs, manual_content_scan_core_name_left);
 | 
						||
                break;
 | 
						||
-            #ifndef HAVE_LAKKA_SWITCH
 | 
						||
             #ifdef HAVE_LAKKA
 | 
						||
             case MENU_ENUM_LABEL_CPU_PERF_MODE:
 | 
						||
                BIND_ACTION_LEFT(cbs, cpu_policy_mode_change);
 | 
						||
@@ -1134,7 +1131,6 @@ static int menu_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs,
 | 
						||
                BIND_ACTION_LEFT(cbs, cpu_policy_freq_managed_gov);
 | 
						||
                break;
 | 
						||
             #endif
 | 
						||
-            #endif
 | 
						||
             default:
 | 
						||
                return -1;
 | 
						||
          }
 | 
						||
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
 | 
						||
index 5f4f7327bb..6104dc6e37 100644
 | 
						||
--- a/menu/cbs/menu_cbs_ok.c
 | 
						||
+++ b/menu/cbs/menu_cbs_ok.c
 | 
						||
@@ -100,7 +100,7 @@
 | 
						||
 #include "../../play_feature_delivery/play_feature_delivery.h"
 | 
						||
 #endif
 | 
						||
 
 | 
						||
-#if defined(HAVE_LAKKA) || defined(HAVE_LIBNX)
 | 
						||
+#if defined(HAVE_LIBNX)
 | 
						||
 #include "../../switch_performance_profiles.h"
 | 
						||
 #endif
 | 
						||
 
 | 
						||
@@ -3914,19 +3914,11 @@ static int action_ok_deferred_list_stub(const char *path,
 | 
						||
    return 0;
 | 
						||
 }
 | 
						||
 
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#if defined(HAVE_LIBNX)
 | 
						||
 static int action_ok_set_switch_cpu_profile(const char *path,
 | 
						||
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 | 
						||
 {
 | 
						||
    char command[PATH_MAX_LENGTH] = {0};
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-   char* profile_name            = SWITCH_CPU_PROFILES[entry_idx];
 | 
						||
-
 | 
						||
-   snprintf(command, sizeof(command), "cpu-profile set '%s'", profile_name);
 | 
						||
-
 | 
						||
-   system(command);
 | 
						||
-   snprintf(command, sizeof(command), "Current profile set to %s", profile_name);
 | 
						||
-#else
 | 
						||
    unsigned profile_clock          = SWITCH_CPU_SPEEDS_VALUES[entry_idx];
 | 
						||
    settings_t *settings            = config_get_ptr();
 | 
						||
 
 | 
						||
@@ -3943,7 +3935,6 @@ static int action_ok_set_switch_cpu_profile(const char *path,
 | 
						||
    }
 | 
						||
    snprintf(command, sizeof(command),
 | 
						||
          "Current Clock set to %i", profile_clock);
 | 
						||
-#endif
 | 
						||
 
 | 
						||
    runloop_msg_queue_push(command, 1, 90, true, NULL,
 | 
						||
          MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
 | 
						||
@@ -3952,33 +3943,6 @@ static int action_ok_set_switch_cpu_profile(const char *path,
 | 
						||
 }
 | 
						||
 #endif
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-
 | 
						||
-static int action_ok_set_switch_gpu_profile(const char *path,
 | 
						||
-      const char *label, unsigned type, size_t idx, size_t entry_idx)
 | 
						||
-{
 | 
						||
-   char command[PATH_MAX_LENGTH];
 | 
						||
-   char            *profile_name  = SWITCH_GPU_PROFILES[entry_idx];
 | 
						||
-
 | 
						||
-   command[0]                     = '\0';
 | 
						||
-
 | 
						||
-   snprintf(command, sizeof(command),
 | 
						||
-         "gpu-profile set '%s'",
 | 
						||
-         profile_name);
 | 
						||
-
 | 
						||
-   system(command);
 | 
						||
-
 | 
						||
-   snprintf(command, sizeof(command),
 | 
						||
-         "Current profile set to %s",
 | 
						||
-         profile_name);
 | 
						||
-
 | 
						||
-   runloop_msg_queue_push(command, 1, 90, true, NULL,
 | 
						||
-         MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
 | 
						||
-
 | 
						||
-   return -1;
 | 
						||
-}
 | 
						||
-
 | 
						||
-#endif
 | 
						||
 
 | 
						||
 static int action_ok_load_core_deferred(const char *path,
 | 
						||
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 | 
						||
@@ -8270,10 +8234,8 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
 | 
						||
 #ifdef HAVE_VIDEO_LAYOUT
 | 
						||
          {MENU_ENUM_LABEL_ONSCREEN_VIDEO_LAYOUT_SETTINGS,      action_ok_onscreen_video_layout_list},
 | 
						||
 #endif
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-         {MENU_ENUM_LABEL_SWITCH_GPU_PROFILE,                  action_ok_push_default},
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+
 | 
						||
+#if defined(HAVE_LIBNX)
 | 
						||
          {MENU_ENUM_LABEL_SWITCH_CPU_PROFILE,                  action_ok_push_default},
 | 
						||
 #endif
 | 
						||
          {MENU_ENUM_LABEL_MENU_WALLPAPER,                      action_ok_menu_wallpaper},
 | 
						||
@@ -8797,12 +8759,7 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
 | 
						||
          case FILE_TYPE_PLAYLIST_ENTRY:
 | 
						||
             BIND_ACTION_OK(cbs, action_ok_playlist_entry_collection);
 | 
						||
             break;
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-         case MENU_SET_SWITCH_GPU_PROFILE:
 | 
						||
-            BIND_ACTION_OK(cbs, action_ok_set_switch_gpu_profile);
 | 
						||
-            break;
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#if defined(HAVE_LIBNX)
 | 
						||
          case MENU_SET_SWITCH_CPU_PROFILE:
 | 
						||
             BIND_ACTION_OK(cbs, action_ok_set_switch_cpu_profile);
 | 
						||
             break;
 | 
						||
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
 | 
						||
index f47ea8c943..396b89064a 100644
 | 
						||
--- a/menu/cbs/menu_cbs_right.c
 | 
						||
+++ b/menu/cbs/menu_cbs_right.c
 | 
						||
@@ -795,7 +795,6 @@ static int manual_content_scan_core_name_right(unsigned type, const char *label,
 | 
						||
    return 0;
 | 
						||
 }
 | 
						||
 
 | 
						||
-#ifndef HAVE_LAKKA_SWITCH
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 static int cpu_policy_mode_change(unsigned type, const char *label,
 | 
						||
       bool wraparound)
 | 
						||
@@ -913,7 +912,7 @@ static int cpu_policy_freq_tweak(unsigned type, const char *label,
 | 
						||
    return 0;
 | 
						||
 }
 | 
						||
 #endif
 | 
						||
-#endif
 | 
						||
+
 | 
						||
 int core_setting_right(unsigned type, const char *label,
 | 
						||
       bool wraparound)
 | 
						||
 {
 | 
						||
@@ -1240,7 +1239,6 @@ static int menu_cbs_init_bind_right_compare_label(menu_file_list_cbs_t *cbs,
 | 
						||
             case MENU_ENUM_LABEL_MANUAL_CONTENT_SCAN_CORE_NAME:
 | 
						||
                BIND_ACTION_RIGHT(cbs, manual_content_scan_core_name_right);
 | 
						||
                break;
 | 
						||
-            #ifndef HAVE_LAKKA_SWITCH
 | 
						||
             #ifdef HAVE_LAKKA
 | 
						||
             case MENU_ENUM_LABEL_CPU_PERF_MODE:
 | 
						||
                BIND_ACTION_RIGHT(cbs, cpu_policy_mode_change);
 | 
						||
@@ -1259,7 +1257,6 @@ static int menu_cbs_init_bind_right_compare_label(menu_file_list_cbs_t *cbs,
 | 
						||
                BIND_ACTION_RIGHT(cbs, cpu_policy_freq_managed_gov);
 | 
						||
                break;
 | 
						||
             #endif
 | 
						||
-            #endif
 | 
						||
             default:
 | 
						||
                return -1;
 | 
						||
          }
 | 
						||
diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
 | 
						||
index 8d67fa41c3..c13741c31c 100644
 | 
						||
--- a/menu/cbs/menu_cbs_sublabel.c
 | 
						||
+++ b/menu/cbs/menu_cbs_sublabel.c
 | 
						||
@@ -1156,14 +1156,10 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_show_wimp,
 | 
						||
 #endif
 | 
						||
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_discord_allow,                         MENU_ENUM_SUBLABEL_DISCORD_ALLOW)
 | 
						||
 
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#if defined(HAVE_LIBNX)
 | 
						||
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_switch_cpu_profile,             MENU_ENUM_SUBLABEL_SWITCH_CPU_PROFILE)
 | 
						||
 #endif
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_switch_gpu_profile,             MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE)
 | 
						||
-#endif
 | 
						||
-
 | 
						||
 #ifdef __linux__
 | 
						||
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_gamemode_enable,                MENU_ENUM_SUBLABEL_GAMEMODE_ENABLE_LINUX)
 | 
						||
 #else
 | 
						||
@@ -1306,7 +1302,6 @@ static int action_bind_sublabel_bluetooth_list(
 | 
						||
 }
 | 
						||
 #endif
 | 
						||
 
 | 
						||
-#ifndef HAVE_LAKKA_SWITCH
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
 static int action_bind_sublabel_cpu_policy_entry_list(
 | 
						||
       file_list_t *list,
 | 
						||
@@ -1339,7 +1334,7 @@ static int action_bind_sublabel_cpu_perf_mode(
 | 
						||
    return 0;
 | 
						||
 }
 | 
						||
 #endif
 | 
						||
-#endif
 | 
						||
+
 | 
						||
 #ifdef HAVE_CHEEVOS
 | 
						||
 static int action_bind_sublabel_cheevos_entry(
 | 
						||
       file_list_t *list,
 | 
						||
@@ -4853,14 +4848,12 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
 | 
						||
          case MENU_ENUM_LABEL_TIMEZONE:
 | 
						||
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_timezone);
 | 
						||
             break;
 | 
						||
-#ifndef HAVE_LAKKA_SWITCH
 | 
						||
          case MENU_ENUM_LABEL_CPU_POLICY_ENTRY:
 | 
						||
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_cpu_policy_entry_list);
 | 
						||
             break;
 | 
						||
          case MENU_ENUM_LABEL_CPU_PERF_MODE:
 | 
						||
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_cpu_perf_mode);
 | 
						||
             break;
 | 
						||
-#endif
 | 
						||
 #endif
 | 
						||
          case MENU_ENUM_LABEL_USER_LANGUAGE:
 | 
						||
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_user_language);
 | 
						||
@@ -4950,15 +4943,10 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
 | 
						||
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_show_wimp);
 | 
						||
             break;
 | 
						||
 #endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#if defined(HAVE_LIBNX)
 | 
						||
          case MENU_ENUM_LABEL_SWITCH_CPU_PROFILE:
 | 
						||
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_switch_cpu_profile);
 | 
						||
             break;
 | 
						||
-#endif
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-         case MENU_ENUM_LABEL_SWITCH_GPU_PROFILE:
 | 
						||
-            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_switch_gpu_profile);
 | 
						||
-            break;
 | 
						||
 #endif
 | 
						||
          case MENU_ENUM_LABEL_GAMEMODE_ENABLE:
 | 
						||
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_gamemode_enable);
 | 
						||
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
 | 
						||
index be03e89c18..b24d740949 100644
 | 
						||
--- a/menu/cbs/menu_cbs_title.c
 | 
						||
+++ b/menu/cbs/menu_cbs_title.c
 | 
						||
@@ -771,14 +771,10 @@ DEFAULT_TITLE_COPY_MACRO(action_get_title_video_shader_preset_save,MENU_ENUM_LAB
 | 
						||
 DEFAULT_TITLE_COPY_MACRO(action_get_title_video_shader_preset_remove,MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_REMOVE)
 | 
						||
 DEFAULT_TITLE_COPY_MACRO(action_get_title_video_shader_preset_save_list,MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE)
 | 
						||
 
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#if defined(HAVE_LIBNX)
 | 
						||
 DEFAULT_TITLE_MACRO(action_get_title_switch_cpu_profile,          MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE)
 | 
						||
 #endif
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-DEFAULT_TITLE_MACRO(action_get_title_switch_gpu_profile,          MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE)
 | 
						||
-#endif
 | 
						||
-
 | 
						||
 DEFAULT_TITLE_SEARCH_FILTER_MACRO(action_get_title_deferred_history_list,   MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY)
 | 
						||
 DEFAULT_TITLE_SEARCH_FILTER_MACRO(action_get_title_deferred_favorites_list, MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES)
 | 
						||
 DEFAULT_TITLE_SEARCH_FILTER_MACRO(action_get_title_deferred_images_list,    MENU_ENUM_LABEL_VALUE_GOTO_IMAGES)
 | 
						||
@@ -1298,13 +1294,9 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
 | 
						||
          action_get_title_core_directory},
 | 
						||
       {MENU_ENUM_LABEL_LIBRETRO_INFO_PATH,
 | 
						||
          action_get_title_core_info_directory},
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#if defined(HAVE_LIBNX)
 | 
						||
       {MENU_ENUM_LABEL_SWITCH_CPU_PROFILE,
 | 
						||
          action_get_title_switch_cpu_profile},
 | 
						||
-#endif
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-      {MENU_ENUM_LABEL_SWITCH_GPU_PROFILE,
 | 
						||
-         action_get_title_switch_gpu_profile},
 | 
						||
 #endif
 | 
						||
       {MENU_ENUM_LABEL_DEFERRED_MANUAL_CONTENT_SCAN_LIST,
 | 
						||
          action_get_title_manual_content_scan_list},
 | 
						||
@@ -1739,15 +1731,10 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
 | 
						||
          case MENU_ENUM_LABEL_LIBRETRO_INFO_PATH:
 | 
						||
             BIND_ACTION_GET_TITLE(cbs, action_get_title_core_info_directory);
 | 
						||
             break;
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#if defined(HAVE_LIBNX)
 | 
						||
          case MENU_ENUM_LABEL_SWITCH_CPU_PROFILE:
 | 
						||
             BIND_ACTION_GET_TITLE(cbs, action_get_title_switch_cpu_profile);
 | 
						||
             break;
 | 
						||
-#endif
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-         case MENU_ENUM_LABEL_SWITCH_GPU_PROFILE:
 | 
						||
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_switch_gpu_profile);
 | 
						||
-            break;
 | 
						||
 #endif
 | 
						||
          case MENU_ENUM_LABEL_MANUAL_CONTENT_SCAN_LIST:
 | 
						||
             BIND_ACTION_GET_TITLE(cbs, action_get_title_manual_content_scan_list);
 | 
						||
diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c
 | 
						||
index 33a9e08583..de1aefd904 100644
 | 
						||
--- a/menu/drivers/ozone.c
 | 
						||
+++ b/menu/drivers/ozone.c
 | 
						||
@@ -2047,10 +2047,7 @@ static uintptr_t ozone_entries_icon_get_texture(
 | 
						||
       case MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS:
 | 
						||
       case MENU_ENUM_LABEL_SETTINGS_SHOW_USER_INTERFACE:
 | 
						||
             return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_UI];
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-      case MENU_ENUM_LABEL_SWITCH_GPU_PROFILE:
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#if defined(HAVE_LIBNX)
 | 
						||
       case MENU_ENUM_LABEL_SWITCH_CPU_PROFILE:
 | 
						||
             return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_POWER];
 | 
						||
 #endif
 | 
						||
@@ -9243,7 +9240,7 @@ static int ozone_list_push(void *data, void *userdata,
 | 
						||
                      false);
 | 
						||
             }
 | 
						||
 
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#if defined(HAVE_LIBNX)
 | 
						||
             MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(
 | 
						||
                   info->list,
 | 
						||
                   MENU_ENUM_LABEL_SWITCH_CPU_PROFILE,
 | 
						||
@@ -9251,14 +9248,6 @@ static int ozone_list_push(void *data, void *userdata,
 | 
						||
                   false);
 | 
						||
 #endif
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-            MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(
 | 
						||
-                  info->list,
 | 
						||
-                  MENU_ENUM_LABEL_SWITCH_GPU_PROFILE,
 | 
						||
-                  PARSE_ACTION,
 | 
						||
-                  false);
 | 
						||
-#endif
 | 
						||
-
 | 
						||
             if (settings->bools.menu_show_configurations && !settings->bools.kiosk_mode_enable)
 | 
						||
             {
 | 
						||
                MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(
 | 
						||
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
 | 
						||
index 3c735766c3..ad3d2edfe6 100644
 | 
						||
--- a/menu/drivers/xmb.c
 | 
						||
+++ b/menu/drivers/xmb.c
 | 
						||
@@ -3180,10 +3180,7 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
 | 
						||
       case MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS:
 | 
						||
       case MENU_ENUM_LABEL_SETTINGS_SHOW_USER_INTERFACE:
 | 
						||
          return xmb->textures.list[XMB_TEXTURE_UI];
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-      case MENU_ENUM_LABEL_SWITCH_GPU_PROFILE:
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#if defined(HAVE_LIBNX)
 | 
						||
       case MENU_ENUM_LABEL_SWITCH_CPU_PROFILE:
 | 
						||
          return xmb->textures.list[XMB_TEXTURE_POWER];
 | 
						||
 #endif
 | 
						||
@@ -7970,22 +7967,13 @@ static int xmb_list_push(void *data, void *userdata,
 | 
						||
                      false);
 | 
						||
             }
 | 
						||
 
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#if defined(HAVE_LIBNX)
 | 
						||
             MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(
 | 
						||
                   info->list,
 | 
						||
                   MENU_ENUM_LABEL_SWITCH_CPU_PROFILE,
 | 
						||
                   PARSE_ACTION,
 | 
						||
                   false);
 | 
						||
 #endif
 | 
						||
-
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-            MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(
 | 
						||
-                  info->list,
 | 
						||
-                  MENU_ENUM_LABEL_SWITCH_GPU_PROFILE,
 | 
						||
-                  PARSE_ACTION,
 | 
						||
-                  false);
 | 
						||
-#endif
 | 
						||
-
 | 
						||
             if (menu_show_configurations && !kiosk_mode_enable)
 | 
						||
             {
 | 
						||
                MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(
 | 
						||
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
 | 
						||
index eaad04f5e9..a21c200af5 100644
 | 
						||
--- a/menu/menu_displaylist.c
 | 
						||
+++ b/menu/menu_displaylist.c
 | 
						||
@@ -50,7 +50,7 @@
 | 
						||
 #include "../core_updater_list.h"
 | 
						||
 #endif
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
+#ifdef HAVE_LAKKA
 | 
						||
 #include "../../lakka.h"
 | 
						||
 #endif
 | 
						||
 
 | 
						||
@@ -58,7 +58,7 @@
 | 
						||
 #include <switch.h>
 | 
						||
 #endif
 | 
						||
 
 | 
						||
-#if defined(HAVE_LAKKA) || defined(HAVE_LIBNX)
 | 
						||
+#if /*defined(HAVE_LAKKA) ||*/ defined(HAVE_LIBNX)
 | 
						||
 #include "../../switch_performance_profiles.h"
 | 
						||
 #endif
 | 
						||
 
 | 
						||
@@ -11694,7 +11694,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
 | 
						||
          /* No-op */
 | 
						||
          break;
 | 
						||
 #endif
 | 
						||
-#ifndef HAVE_LAKKA_SWITCH
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
       case DISPLAYLIST_CPU_POLICY_LIST:
 | 
						||
          menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
 | 
						||
@@ -11796,30 +11795,17 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
 | 
						||
          break;
 | 
						||
       }
 | 
						||
 #endif
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#if defined(HAVE_LIBNX)
 | 
						||
       case DISPLAYLIST_SWITCH_CPU_PROFILE:
 | 
						||
       {
 | 
						||
          unsigned i;
 | 
						||
          char text[PATH_MAX_LENGTH];
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-         char current_profile[PATH_MAX_LENGTH];
 | 
						||
-         FILE               *profile = NULL;
 | 
						||
-#endif
 | 
						||
          const size_t profiles_count = sizeof(SWITCH_CPU_PROFILES)/sizeof(SWITCH_CPU_PROFILES[1]);
 | 
						||
 
 | 
						||
          runloop_msg_queue_push("Warning : extended overclocking can damage the Switch", 1, 90, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
 | 
						||
 
 | 
						||
          menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-         profile = popen("cpu-profile get", "r");
 | 
						||
-         fgets(current_profile, PATH_MAX_LENGTH, profile);
 | 
						||
-         pclose(profile);
 | 
						||
-
 | 
						||
-         snprintf(text, sizeof(text),
 | 
						||
-               "Current profile: %s", current_profile);
 | 
						||
-#else
 | 
						||
          u32 currentClock = 0;
 | 
						||
          if (hosversionBefore(8, 0, 0))
 | 
						||
             pcvGetClockRate(PcvModule_CpuBus, ¤tClock);
 | 
						||
@@ -11831,7 +11817,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
 | 
						||
             clkrstCloseSession(&session);
 | 
						||
          }
 | 
						||
          snprintf(text, sizeof(text), "Current Clock : %i", currentClock);
 | 
						||
-#endif
 | 
						||
          if (menu_entries_append(info->list,
 | 
						||
             text,
 | 
						||
             "",
 | 
						||
@@ -11861,49 +11846,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
 | 
						||
                             | MD_FLAG_NEED_CLEAR;
 | 
						||
          break;
 | 
						||
       }
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH)
 | 
						||
-      case DISPLAYLIST_SWITCH_GPU_PROFILE:
 | 
						||
-      {
 | 
						||
-         unsigned i;
 | 
						||
-         char text[PATH_MAX_LENGTH];
 | 
						||
-         char current_profile[PATH_MAX_LENGTH];
 | 
						||
-         FILE               *profile = NULL;
 | 
						||
-         const size_t profiles_count = sizeof(SWITCH_GPU_PROFILES)/sizeof(SWITCH_GPU_PROFILES[1]);
 | 
						||
-
 | 
						||
-         runloop_msg_queue_push("Warning : extended overclocking can damage the Switch", 1, 90, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
 | 
						||
-
 | 
						||
-         profile = popen("gpu-profile get", "r");
 | 
						||
-         fgets(current_profile, PATH_MAX_LENGTH, profile);
 | 
						||
-         pclose(profile);
 | 
						||
-
 | 
						||
-         menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
 | 
						||
-
 | 
						||
-         /* TODO/FIXME - Localize */
 | 
						||
-         snprintf(text, sizeof(text),
 | 
						||
-               "Current profile : %s", current_profile);
 | 
						||
-
 | 
						||
-         if (menu_entries_append(info->list, text, "", 0, MENU_INFO_MESSAGE, 0, 0, NULL))
 | 
						||
-            count++;
 | 
						||
-
 | 
						||
-         for (i = 0; i < profiles_count; i++)
 | 
						||
-         {
 | 
						||
-            char title[PATH_MAX_LENGTH];
 | 
						||
-            char* profile               = SWITCH_GPU_PROFILES[i];
 | 
						||
-            char* speed                 = SWITCH_GPU_SPEEDS[i];
 | 
						||
-
 | 
						||
-            snprintf(title, sizeof(title), "%s (%s)", profile, speed);
 | 
						||
-
 | 
						||
-            if (menu_entries_append(info->list, title, "", 0, MENU_SET_SWITCH_GPU_PROFILE, 0, i, NULL))
 | 
						||
-               count++;
 | 
						||
-         }
 | 
						||
-
 | 
						||
-         info->flags       |= MD_FLAG_NEED_REFRESH
 | 
						||
-                            | MD_FLAG_NEED_PUSH
 | 
						||
-                            | MD_FLAG_NEED_CLEAR;
 | 
						||
-         break;
 | 
						||
-      }
 | 
						||
-#endif /* HAVE_LAKKA_SWITCH */
 | 
						||
-#endif /* HAVE_LAKKA_SWITCH || HAVE_LIBNX */
 | 
						||
+#endif /* HAVE_LIBNX */
 | 
						||
       case DISPLAYLIST_MUSIC_LIST:
 | 
						||
          {
 | 
						||
             menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
 | 
						||
diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h
 | 
						||
index 76ec5c7250..af54c0cb7b 100644
 | 
						||
--- a/menu/menu_displaylist.h
 | 
						||
+++ b/menu/menu_displaylist.h
 | 
						||
@@ -268,10 +268,7 @@ enum menu_displaylist_ctl_state
 | 
						||
    DISPLAYLIST_CORE_CONTENT_DIRS,
 | 
						||
    DISPLAYLIST_CORE_CONTENT_DIRS_SUBDIR,
 | 
						||
    DISPLAYLIST_CORE_SYSTEM_FILES,
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-   DISPLAYLIST_SWITCH_GPU_PROFILE,
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#if defined(HAVE_LIBNX)
 | 
						||
    DISPLAYLIST_SWITCH_CPU_PROFILE,
 | 
						||
 #endif
 | 
						||
    DISPLAYLIST_MANUAL_CONTENT_SCAN_LIST,
 | 
						||
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
 | 
						||
index 273e8ed2b3..9609f48b59 100644
 | 
						||
--- a/menu/menu_driver.c
 | 
						||
+++ b/menu/menu_driver.c
 | 
						||
@@ -74,9 +74,6 @@
 | 
						||
 
 | 
						||
 #ifdef HAVE_LIBNX
 | 
						||
 #include <switch.h>
 | 
						||
-#endif
 | 
						||
-
 | 
						||
-#if defined(HAVE_LAKKA) || defined(HAVE_LIBNX)
 | 
						||
 #include "../switch_performance_profiles.h"
 | 
						||
 #endif
 | 
						||
 
 | 
						||
@@ -6761,11 +6758,9 @@ void menu_driver_toggle(
 | 
						||
 
 | 
						||
    if (on) 
 | 
						||
    {
 | 
						||
-#ifndef HAVE_LAKKA_SWITCH
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
       set_cpu_scaling_signal(CPUSCALING_EVENT_FOCUS_MENU);
 | 
						||
 #endif
 | 
						||
-#endif /* #ifndef HAVE_LAKKA_SWITCH */
 | 
						||
 #ifdef HAVE_OVERLAY
 | 
						||
       /* If an overlay was displayed before the toggle
 | 
						||
        * and overlays are disabled in menu, need to
 | 
						||
@@ -6784,11 +6779,9 @@ void menu_driver_toggle(
 | 
						||
    }
 | 
						||
    else
 | 
						||
    {
 | 
						||
-#ifndef HAVE_LAKKA_SWITCH
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
       set_cpu_scaling_signal(CPUSCALING_EVENT_FOCUS_CORE);
 | 
						||
 #endif
 | 
						||
-#endif /* #ifndef HAVE_LAKKA_SWITCH */
 | 
						||
 #ifdef HAVE_OVERLAY
 | 
						||
       /* Inhibits pointer 'select' and 'cancel' actions
 | 
						||
        * (until the next time 'select'/'cancel' are released) */
 | 
						||
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
 | 
						||
index e7fe155a99..ba5a80e3ee 100644
 | 
						||
--- a/menu/menu_driver.h
 | 
						||
+++ b/menu/menu_driver.h
 | 
						||
@@ -242,10 +242,7 @@ enum menu_settings_type
 | 
						||
 
 | 
						||
    MENU_SET_SCREEN_BRIGHTNESS,
 | 
						||
 
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-   MENU_SET_SWITCH_GPU_PROFILE,
 | 
						||
-#endif
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#if defined(HAVE_LIBNX)
 | 
						||
    MENU_SET_SWITCH_CPU_PROFILE,
 | 
						||
 #endif
 | 
						||
 
 | 
						||
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
 | 
						||
index 6aa2236def..1f024440f5 100644
 | 
						||
--- a/menu/menu_setting.c
 | 
						||
+++ b/menu/menu_setting.c
 | 
						||
@@ -8074,7 +8074,8 @@ static void general_write_handler(rarch_setting_t *setting)
 | 
						||
             }
 | 
						||
          }
 | 
						||
          break;
 | 
						||
-      case MENU_ENUM_LABEL_INPUT_POLL_TYPE_BEHAVIOR:
 | 
						||
+
 | 
						||
+     case MENU_ENUM_LABEL_INPUT_POLL_TYPE_BEHAVIOR:
 | 
						||
          core_set_poll_type(*setting->value.target.integer);
 | 
						||
          break;
 | 
						||
       case MENU_ENUM_LABEL_VIDEO_SCALE_INTEGER:
 | 
						||
@@ -9994,7 +9995,7 @@ static bool setting_append_list(
 | 
						||
          MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_QUIT);
 | 
						||
 #endif
 | 
						||
 
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
+#ifdef HAVE_LIBNX
 | 
						||
         CONFIG_ACTION(
 | 
						||
               list, list_info,
 | 
						||
               MENU_ENUM_LABEL_SWITCH_CPU_PROFILE,
 | 
						||
@@ -10005,15 +10006,6 @@ static bool setting_append_list(
 | 
						||
 #endif
 | 
						||
 
 | 
						||
 #if defined(HAVE_LAKKA)
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-        CONFIG_ACTION(
 | 
						||
-               list, list_info,
 | 
						||
-               MENU_ENUM_LABEL_SWITCH_GPU_PROFILE,
 | 
						||
-               MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
 | 
						||
-               &group_info,
 | 
						||
-               &subgroup_info,
 | 
						||
-               parent_group);
 | 
						||
-#endif
 | 
						||
          CONFIG_ACTION(
 | 
						||
                list, list_info,
 | 
						||
                MENU_ENUM_LABEL_REBOOT,
 | 
						||
@@ -18578,7 +18570,6 @@ static bool setting_append_list(
 | 
						||
 #endif
 | 
						||
 
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
-#ifndef HAVE_LAKKA_SWITCH
 | 
						||
          CONFIG_ACTION(
 | 
						||
                list, list_info,
 | 
						||
                MENU_ENUM_LABEL_CPU_PERFPOWER,
 | 
						||
@@ -18587,8 +18578,6 @@ static bool setting_append_list(
 | 
						||
                &subgroup_info,
 | 
						||
                parent_group);
 | 
						||
 #endif
 | 
						||
-#endif
 | 
						||
-
 | 
						||
          if (frontend_driver_has_gamemode())
 | 
						||
             CONFIG_BOOL(
 | 
						||
                   list, list_info,
 | 
						||
diff --git a/retroarch.c b/retroarch.c
 | 
						||
index 6533c8f824..2624a9a9f9 100644
 | 
						||
--- a/retroarch.c
 | 
						||
+++ b/retroarch.c
 | 
						||
@@ -90,9 +90,6 @@
 | 
						||
 
 | 
						||
 #ifdef HAVE_LIBNX
 | 
						||
 #include <switch.h>
 | 
						||
-#endif
 | 
						||
-
 | 
						||
-#if defined(HAVE_LAKKA) || defined(HAVE_LIBNX)
 | 
						||
 #include "switch_performance_profiles.h"
 | 
						||
 #endif
 | 
						||
 
 | 
						||
@@ -960,11 +957,9 @@ void drivers_init(
 | 
						||
    if (flags & DRIVER_MIDI_MASK)
 | 
						||
       midi_driver_init(settings);
 | 
						||
 
 | 
						||
-#ifndef HAVE_LAKKA_SWITCH
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
    cpu_scaling_driver_init();
 | 
						||
 #endif
 | 
						||
-#endif /* #ifndef HAVE_LAKKA_SWITCH */
 | 
						||
 }
 | 
						||
 
 | 
						||
 void driver_uninit(int flags)
 | 
						||
@@ -1058,11 +1053,9 @@ void driver_uninit(int flags)
 | 
						||
    if (flags & DRIVER_MIDI_MASK)
 | 
						||
       midi_driver_free();
 | 
						||
 
 | 
						||
-#ifndef HAVE_LAKKA_SWITCH
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
    cpu_scaling_driver_free();
 | 
						||
 #endif
 | 
						||
-#endif /* #ifndef HAVE_LAKKA_SWITCH */
 | 
						||
 }
 | 
						||
 
 | 
						||
 static void retroarch_deinit_drivers(struct retro_callbacks *cbs)
 | 
						||
diff --git a/runloop.c b/runloop.c
 | 
						||
index cfccbec4ca..7e09cf4925 100644
 | 
						||
--- a/runloop.c
 | 
						||
+++ b/runloop.c
 | 
						||
@@ -94,9 +94,6 @@
 | 
						||
 
 | 
						||
 #ifdef HAVE_LIBNX
 | 
						||
 #include <switch.h>
 | 
						||
-#endif
 | 
						||
-
 | 
						||
-#if defined(HAVE_LAKKA) || defined(HAVE_LIBNX)
 | 
						||
 #include "switch_performance_profiles.h"
 | 
						||
 #endif
 | 
						||
 
 | 
						||
@@ -4641,19 +4638,15 @@ void runloop_pause_checks(void)
 | 
						||
       command_event(CMD_EVENT_PRESENCE_UPDATE, &userdata);
 | 
						||
 #endif
 | 
						||
 
 | 
						||
-#ifndef HAVE_LAKKA_SWITCH
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
       set_cpu_scaling_signal(CPUSCALING_EVENT_FOCUS_MENU);
 | 
						||
 #endif
 | 
						||
-#endif /* #ifndef HAVE_LAKKA_SWITCH */
 | 
						||
    }
 | 
						||
    else
 | 
						||
    {
 | 
						||
-#ifndef HAVE_LAKKA_SWITCH
 | 
						||
 #ifdef HAVE_LAKKA
 | 
						||
       set_cpu_scaling_signal(CPUSCALING_EVENT_FOCUS_CORE);
 | 
						||
 #endif
 | 
						||
-#endif /* #ifndef HAVE_LAKKA_SWITCH */
 | 
						||
    }
 | 
						||
 
 | 
						||
 #if defined(HAVE_TRANSLATE) && defined(HAVE_GFX_WIDGETS)
 | 
						||
diff --git a/switch_performance_profiles.h b/switch_performance_profiles.h
 | 
						||
index 5d07ba6ed5..d51d645d3d 100644
 | 
						||
--- a/switch_performance_profiles.h
 | 
						||
+++ b/switch_performance_profiles.h
 | 
						||
@@ -17,52 +17,9 @@
 | 
						||
 #ifndef __SWITCH_PERFORMANCE_PROFILES_H
 | 
						||
 #define __SWITCH_PERFORMANCE_PROFILES_H
 | 
						||
 
 | 
						||
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 | 
						||
-#ifdef HAVE_LAKKA_SWITCH
 | 
						||
-static char *SWITCH_GPU_PROFILES[] = {
 | 
						||
-    "Docked Stock +2",
 | 
						||
-    "Docked Stock +1",
 | 
						||
-    "Docked Stock Mode",
 | 
						||
-    "Handheld Boost +3",
 | 
						||
-    "Handheld Boost +2",
 | 
						||
-    "Handheld Boost +1",
 | 
						||
-    "Handheld Boost Mode",
 | 
						||
-    "Handheld Stock +1",
 | 
						||
-    "Handheld Stock Mode",
 | 
						||
-    "Powersaving +2",
 | 
						||
-    "Powersaving +1",
 | 
						||
-    "Powersaving Mode",
 | 
						||
-};
 | 
						||
-
 | 
						||
-static char *SWITCH_GPU_SPEEDS[] = {
 | 
						||
-    "921 Mhz",
 | 
						||
-    "844 Mhz",
 | 
						||
-    "768 Mhz",
 | 
						||
-    "691 Mhz",
 | 
						||
-    "614 Mhz",
 | 
						||
-    "537 Mhz",
 | 
						||
-    "460 Mhz",
 | 
						||
-    "384 Mhz",
 | 
						||
-    "307 Mhz",
 | 
						||
-    "230 Mhz",
 | 
						||
-    "153 Mhz",
 | 
						||
-    "76 Mhz"
 | 
						||
-};
 | 
						||
-#endif
 | 
						||
+#if defined(HAVE_LIBNX)
 | 
						||
 
 | 
						||
 static char *SWITCH_CPU_PROFILES[] = {
 | 
						||
-#ifndef HAVE_LIBNX
 | 
						||
-    "Max Overdrive +3",
 | 
						||
-    "Max Overdrive +2",
 | 
						||
-    "Max Overdrive +1",
 | 
						||
-    "Maximum Performance",
 | 
						||
-    "High Performance",
 | 
						||
-    "Boost Performance",
 | 
						||
-    "Stock Performance",
 | 
						||
-    "Powersaving Mode 1",
 | 
						||
-    "Powersaving Mode 2",
 | 
						||
-    "Powersaving Mode 3",
 | 
						||
-#else
 | 
						||
     "Maximum Performance",
 | 
						||
     "High Performance",
 | 
						||
     "Boost Performance",
 | 
						||
@@ -70,25 +27,12 @@ static char *SWITCH_CPU_PROFILES[] = {
 | 
						||
     "Powersaving Mode 1",
 | 
						||
     "Powersaving Mode 2",
 | 
						||
     "Powersaving Mode 3",
 | 
						||
-#endif
 | 
						||
 };
 | 
						||
 
 | 
						||
 #define SWITCH_DEFAULT_CPU_PROFILE 3 /* Stock Performance */
 | 
						||
 #define LIBNX_MAX_CPU_PROFILE 0 /* Max Performance */
 | 
						||
 
 | 
						||
 static char *SWITCH_CPU_SPEEDS[] = {
 | 
						||
-#ifndef HAVE_LIBNX
 | 
						||
-    " **UNSTABLE**  2091 MHz",
 | 
						||
-    " **UNSTABLE**  1989 MHz",
 | 
						||
-    " **UNSTABLE**  1887 MHz",
 | 
						||
-    "1785 MHz",
 | 
						||
-    "1581 MHz",
 | 
						||
-    "1224 MHz",
 | 
						||
-    "1020 MHz",
 | 
						||
-    "918 MHz",
 | 
						||
-    "816 MHz",
 | 
						||
-    "714 MHz"
 | 
						||
-#else
 | 
						||
     "1785 MHz",
 | 
						||
     "1581 MHz",
 | 
						||
     "1224 MHz",
 | 
						||
@@ -96,11 +40,8 @@ static char *SWITCH_CPU_SPEEDS[] = {
 | 
						||
     "918 MHz",
 | 
						||
     "816 MHz",
 | 
						||
     "714 MHz"
 | 
						||
-#endif
 | 
						||
 };
 | 
						||
 
 | 
						||
-#ifdef HAVE_LIBNX
 | 
						||
-// not used in switch-lakka
 | 
						||
 static unsigned SWITCH_CPU_SPEEDS_VALUES[] = {
 | 
						||
     1785000000,
 | 
						||
     1581000000,
 | 
						||
@@ -110,7 +51,6 @@ static unsigned SWITCH_CPU_SPEEDS_VALUES[] = {
 | 
						||
     816000000,
 | 
						||
     714000000
 | 
						||
 };
 | 
						||
-#endif
 | 
						||
 
 | 
						||
 #endif
 | 
						||
 
 | 
						||
-- 
 | 
						||
2.25.1
 | 
						||
 |