summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZephyron <zephyron@citron-emu.org>2025-04-30 15:25:57 +1000
committerMike Lothian <mike@fireburn.co.uk>2025-05-12 12:46:19 +0100
commit88d153ae6954f58aac1cbbc9680b8081a58fcb7f (patch)
tree9c575780f7f31a8c2552e71d3b66b349acaa2ee9
parent6d023e89b84af2492e8097ebe5140da3c309db6b (diff)
chore: Make firmware optional rather than required
This commit makes firmware non-mandatory for the emulator to function. Changes include: - Converting firmware errors to warnings in loader - Removing firmware requirement checks in Android - Removing firmware and title.keys setup screens - Adding --allow-unsupported flag for Android vcpkg - Updating vcpkg baseline - Enforce software keyboard in Android Signed-off-by: Zephyron <zephyron@citron-emu.org>
-rw-r--r--CMakeLists.txt4
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt21
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt1
3 files changed, 9 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 890ce254a..a9e489ba0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,7 +133,9 @@ endif()
if (YUZU_USE_BUNDLED_VCPKG)
if (ANDROID)
- set(ENV{ANDROID_NDK_HOME} "${ANDROID_NDK}")
+ set(ENV{ANDROID_NDK_HOME} ${ANDROID_NDK})
+ set(VCPKG_ADDITIONAL_FLAGS "--allow-unsupported")
+ set(VCPKG_INSTALL_OPTIONS "--allow-unsupported")
list(APPEND VCPKG_MANIFEST_FEATURES "android")
if (CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a")
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
index 7839c26ca..6d43354f3 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
@@ -150,22 +150,13 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
if (event.action == KeyEvent.ACTION_DOWN) {
- if (keyCode == KeyEvent.KEYCODE_ENTER) {
- // Special case, we do not support multiline input, dismiss the keyboard.
- val overlayView: View =
- this.findViewById(R.id.surface_input_overlay)
- val im =
- overlayView.context.getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
- im.hideSoftInputFromWindow(overlayView.windowToken, 0)
+ val textChar = event.unicodeChar
+ if (textChar == 0) {
+ // No text, button input.
+ NativeLibrary.submitInlineKeyboardInput(keyCode)
} else {
- val textChar = event.unicodeChar
- if (textChar == 0) {
- // No text, button input.
- NativeLibrary.submitInlineKeyboardInput(keyCode)
- } else {
- // Text submitted.
- NativeLibrary.submitInlineKeyboardText(textChar.toChar().toString())
- }
+ // Text submitted.
+ NativeLibrary.submitInlineKeyboardText(textChar.toChar().toString())
}
}
return super.onKeyDown(keyCode, event)
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt
index 4f7548e98..d3be120c4 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt
@@ -332,7 +332,6 @@ class SetupFragment : Fragment() {
}
}
}
-
private lateinit var gamesDirCallback: SetupCallback
val getGamesDirectory =