mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
fix some errors on some devices
This commit is contained in:
@@ -44,8 +44,8 @@ android {
|
||||
"-DXEMU_ENABLE_XISO_CONVERTER=ON",
|
||||
"-DCMAKE_C_FLAGS_DEBUG=-O2 -g0",
|
||||
"-DCMAKE_CXX_FLAGS_DEBUG=-O2 -g0",
|
||||
"-DCMAKE_C_FLAGS_RELEASE=-O3 -g0 -march=armv8.2-a -ffunction-sections -fdata-sections",
|
||||
"-DCMAKE_CXX_FLAGS_RELEASE=-O3 -g0 -march=armv8.2-a -ffunction-sections -fdata-sections",
|
||||
"-DCMAKE_C_FLAGS_RELEASE=-O2 -g0 -march=armv8-a -ffunction-sections -fdata-sections",
|
||||
"-DCMAKE_CXX_FLAGS_RELEASE=-O2 -g0 -march=armv8-a -ffunction-sections -fdata-sections",
|
||||
"-DCMAKE_EXE_LINKER_FLAGS_RELEASE=-Wl,--gc-sections",
|
||||
"-DCMAKE_SHARED_LINKER_FLAGS_RELEASE=-Wl,--gc-sections"
|
||||
)
|
||||
|
||||
@@ -867,7 +867,7 @@ target_compile_definitions(xemu_core PRIVATE
|
||||
|
||||
target_compile_options(xemu_core PRIVATE -g0
|
||||
$<$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>,$<CONFIG:MinSizeRel>>:-UNDEBUG>
|
||||
$<$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>:-O3 -march=armv8.2-a -ffunction-sections -fdata-sections>
|
||||
$<$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>:-O2 -march=armv8-a -ffunction-sections -fdata-sections>
|
||||
)
|
||||
|
||||
target_include_directories(xemu_core PRIVATE
|
||||
@@ -937,7 +937,7 @@ endif()
|
||||
|
||||
target_compile_options(xemu PRIVATE -fexceptions -frtti -g0
|
||||
$<$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>,$<CONFIG:MinSizeRel>>:-UNDEBUG>
|
||||
$<$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>:-O3 -march=armv8.2-a -ffunction-sections -fdata-sections>
|
||||
$<$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>:-O2 -march=armv8-a -ffunction-sections -fdata-sections>
|
||||
)
|
||||
|
||||
target_link_options(xemu PRIVATE
|
||||
|
||||
@@ -1087,11 +1087,13 @@ class GameLibraryActivity : AppCompatActivity() {
|
||||
|
||||
private fun launchGame(game: GameEntry) {
|
||||
persistUriPermission(game.uri)
|
||||
// MainActivity runs in :xemu, so the disc selection must be flushed before
|
||||
// the other process reads SharedPreferences during startup.
|
||||
prefs.edit()
|
||||
.putString("dvdUri", game.uri.toString())
|
||||
.remove("dvdPath")
|
||||
.putBoolean("skip_game_picker", false)
|
||||
.apply()
|
||||
.commit()
|
||||
|
||||
startActivity(Intent(this, MainActivity::class.java))
|
||||
finish()
|
||||
|
||||
@@ -93,6 +93,8 @@ class LauncherActivity : Activity() {
|
||||
if (frontendLaunch.dvdUri != null) {
|
||||
FrontendLaunchHelper.persistReadPermission(this, intent, frontendLaunch.dvdUri)
|
||||
}
|
||||
// MainActivity runs in :xemu, so launch data must be flushed before
|
||||
// handing off to the emulator process.
|
||||
prefs.edit()
|
||||
.putBoolean("skip_game_picker", false)
|
||||
.apply {
|
||||
@@ -107,7 +109,7 @@ class LauncherActivity : Activity() {
|
||||
}
|
||||
}
|
||||
}
|
||||
.apply()
|
||||
.commit()
|
||||
|
||||
if (hasMcpx && hasFlash && hasHdd) {
|
||||
Log.i(TAG, "Frontend launch resolved via ${frontendLaunch.source}")
|
||||
|
||||
Reference in New Issue
Block a user