[Android] Fix Wii games.

This commit is contained in:
Ryan Houdek 2013-08-17 19:41:28 -05:00
parent 7294fe5a3f
commit ba76b016da
2 changed files with 12 additions and 1 deletions

View file

@ -102,8 +102,12 @@ public final class DolphinEmulator<MainActivity> extends Activity
directory = new File(GCDir); directory = new File(GCDir);
directory.mkdirs(); directory.mkdirs();
String WiiDir = BaseDir + File.separator + "Wii";
directory = new File(WiiDir);
directory.mkdirs();
// Copy assets if needed // 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()) if(!file.exists())
{ {
CopyAsset("ButtonA.png", BaseDir + File.separator + "ButtonA.png"); CopyAsset("ButtonA.png", BaseDir + File.separator + "ButtonA.png");
@ -116,6 +120,10 @@ public final class DolphinEmulator<MainActivity> extends Activity
CopyAsset("dsp_rom.bin", GCDir + File.separator + "dsp_rom.bin"); CopyAsset("dsp_rom.bin", GCDir + File.separator + "dsp_rom.bin");
CopyAsset("font_ansi.bin", GCDir + File.separator + "font_ansi.bin"); CopyAsset("font_ansi.bin", GCDir + File.separator + "font_ansi.bin");
CopyAsset("font_sjis.bin", GCDir + File.separator + "font_sjis.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 prefs = PreferenceManager.getDefaultSharedPreferences(this);
SharedPreferences.Editor editor = prefs.edit(); SharedPreferences.Editor editor = prefs.edit();

View file

@ -200,6 +200,9 @@ if(ANDROID)
add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/GC/* ${CMAKE_SOURCE_DIR}/Source/Android/assets/ 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() else()
add_executable(${DOLPHIN_EXE} ${SRCS}) add_executable(${DOLPHIN_EXE} ${SRCS})
target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS}) target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS})