ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Android] Copy over DSP roms and font assets on build and first runs.

This commit is contained in:
Ryan Houdek 2013-07-05 19:18:33 -05:00
parent c19858ca87
commit cdfd7905a0
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
View File

@ -83,18 +83,22 @@ public class DolphinEmulator<MainActivity> extends Activity
startActivityForResult(ListIntent, 1); startActivityForResult(ListIntent, 1);
// Make the assets directory // Make the assets directory
String strDir = Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu"; String BaseDir = Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu";
File directory = new File(strDir); File directory = new File(BaseDir);
directory.mkdirs(); directory.mkdirs();
strDir += File.separator+"Config"; String ConfigDir = BaseDir + File.separator + "Config";
directory = new File(strDir); directory = new File(ConfigDir);
directory.mkdirs(); directory.mkdirs();
String GCDir = BaseDir + File.separator + "GC";
directory = new File(GCDir);
directory.mkdirs();
// Copy assets if needed // Copy assets if needed
java.io.File file = new java.io.File( java.io.File file = new java.io.File(
Environment.getExternalStorageDirectory()+File.separator+ 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()) if(!file.exists())
{ {
CopyAsset("ButtonA.png", CopyAsset("ButtonA.png",
@ -115,6 +119,18 @@ public class DolphinEmulator<MainActivity> extends Activity
CopyAsset("Dolphin.ini", CopyAsset("Dolphin.ini",
Environment.getExternalStorageDirectory()+File.separator+ Environment.getExternalStorageDirectory()+File.separator+
"dolphin-emu" + File.separator + "Config" + File.separator + "Dolphin.ini"); "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 prefs = PreferenceManager.getDefaultSharedPreferences(this);
SharedPreferences.Editor editor = prefs.edit(); SharedPreferences.Editor editor = prefs.edit();

3
Source/Core/DolphinWX/CMakeLists.txt
View File

@ -179,6 +179,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}/libs/armeabi-v7a/lib${DOLPHIN_EXE}.so ${CMAKE_SOURCE_DIR}/Source/Android/libs/armeabi-v7a/ 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() 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})