diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-07-05 19:18:33 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-07-05 19:18:33 -0500 |
| commit | cdfd7905a05693b6b37b3dd2c747c220c8b8b8bf (patch) | |
| tree | d4e28f6946ab9c3882323557ec7a214fb01b7034 /Source | |
| parent | c19858ca87141a13924d0c84031ecaa7d4478aa5 (diff) | |
[Android] Copy over DSP roms and font assets on build and first runs.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java | 28 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/CMakeLists.txt | 3 |
2 files changed, 25 insertions, 6 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java index 7150af7e11..af2f2df326 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java @@ -83,18 +83,22 @@ public class DolphinEmulator<MainActivity> extends Activity startActivityForResult(ListIntent, 1); // Make the assets directory - String strDir = Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu"; - File directory = new File(strDir); + String BaseDir = Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu"; + File directory = new File(BaseDir); directory.mkdirs(); - strDir += File.separator+"Config"; - directory = new File(strDir); + String ConfigDir = BaseDir + File.separator + "Config"; + directory = new File(ConfigDir); directory.mkdirs(); - + + String GCDir = BaseDir + File.separator + "GC"; + directory = new File(GCDir); + directory.mkdirs(); + // Copy assets if needed java.io.File file = new java.io.File( Environment.getExternalStorageDirectory()+File.separator+ - "dolphin-emu" + File.separator + "Config" + File.separator + "Dolphin.ini"); + "dolphin-emu" + File.separator + "GC" + File.separator + "dsp_coef.bin"); if(!file.exists()) { CopyAsset("ButtonA.png", @@ -115,6 +119,18 @@ public class DolphinEmulator<MainActivity> extends Activity CopyAsset("Dolphin.ini", Environment.getExternalStorageDirectory()+File.separator+ "dolphin-emu" + File.separator + "Config" + File.separator + "Dolphin.ini"); + CopyAsset("dsp_coef.bin", + Environment.getExternalStorageDirectory()+File.separator+ + "dolphin-emu" + File.separator + "GC" + File.separator + "dsp_coef.bin"); + CopyAsset("dsp_rom.bin", + Environment.getExternalStorageDirectory()+File.separator+ + "dolphin-emu" + File.separator + "GC" + File.separator + "dsp_rom.bin"); + CopyAsset("font_ansi.bin", + Environment.getExternalStorageDirectory()+File.separator+ + "dolphin-emu" + File.separator + "GC" + File.separator + "font_ansi.bin"); + CopyAsset("font_sjis.bin", + Environment.getExternalStorageDirectory()+File.separator+ + "dolphin-emu" + File.separator + "GC" + File.separator + "font_sjis.bin"); 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 6207ac70d3..9e40bbd90b 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -179,6 +179,9 @@ if(ANDROID) add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/libs/armeabi-v7a/lib${DOLPHIN_EXE}.so ${CMAKE_SOURCE_DIR}/Source/Android/libs/armeabi-v7a/ ) + add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD + COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/GC/* ${CMAKE_SOURCE_DIR}/Source/Android/assets/ + ) else() add_executable(${DOLPHIN_EXE} ${SRCS}) target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS}) |