From ba76b016daabaaebbab10a8de8cc8c99b74431d4 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 17 Aug 2013 19:41:28 -0500 Subject: [PATCH] [Android] Fix Wii games. --- .../src/org/dolphinemu/dolphinemu/DolphinEmulator.java | 10 +++++++++- Source/Core/DolphinWX/CMakeLists.txt | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java index d1e23d1e53..08c95fd2cd 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java @@ -102,8 +102,12 @@ public final class DolphinEmulator extends Activity directory = new File(GCDir); directory.mkdirs(); + String WiiDir = BaseDir + File.separator + "Wii"; + directory = new File(WiiDir); + directory.mkdirs(); + // Copy assets if needed - File file = new File(GCDir + File.separator + "dsp_coef.bin"); + File file = new File(WiiDir + File.separator + "setting-usa.txt"); if(!file.exists()) { CopyAsset("ButtonA.png", BaseDir + File.separator + "ButtonA.png"); @@ -116,6 +120,10 @@ public final class DolphinEmulator extends Activity CopyAsset("dsp_rom.bin", GCDir + File.separator + "dsp_rom.bin"); CopyAsset("font_ansi.bin", GCDir + File.separator + "font_ansi.bin"); CopyAsset("font_sjis.bin", GCDir + File.separator + "font_sjis.bin"); + CopyAsset("setting-eur.txt", WiiDir + File.separator + "setting-eur.txt"); + CopyAsset("setting-jpn.txt", WiiDir + File.separator + "setting-jpn.txt"); + CopyAsset("setting-kor.txt", WiiDir + File.separator + "setting-kor.txt"); + CopyAsset("setting-usa.txt", WiiDir + File.separator + "setting-usa.txt"); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences.Editor editor = prefs.edit(); diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 82f0e9b580..62ce9808a2 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -200,6 +200,9 @@ if(ANDROID) add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/GC/* ${CMAKE_SOURCE_DIR}/Source/Android/assets/ ) + add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD + COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/Wii/* ${CMAKE_SOURCE_DIR}/Source/Android/assets/ + ) else() add_executable(${DOLPHIN_EXE} ${SRCS}) target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS})