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

dolphin-emu · Jul 6, 2013 · cdfd790 · cdfd790
1 parent c19858c
commit cdfd790
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -83,18 +83,22 @@ public void onCreate(Bundle savedInstanceState) {
 			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 void onCreate(Bundle savedInstanceState) {
 				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
@@ -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})