diff options
| author | degasus <wickmarkus@web.de> | 2016-04-03 10:38:41 +0200 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2016-04-24 14:44:30 +0200 |
| commit | 3f704dca75e3a3225e14dcab8ef1fae485682cae (patch) | |
| tree | ec65d3eab0f28534aaac93954fdde8e4d578ba73 /Source/Android | |
| parent | bdb9da21041fdcefa4504c28259647eea910e36c (diff) | |
Android: Also copy sys/Wii directory.
Seems like this one was just missed, some games just did not start without it.
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/AssetCopyService.java | 9 | ||||
| -rw-r--r-- | Source/Android/jni/CMakeLists.txt | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/AssetCopyService.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/AssetCopyService.java index a93e9c501b..a700b31aa2 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/AssetCopyService.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/AssetCopyService.java @@ -37,18 +37,15 @@ public final class AssetCopyService extends IntentService { String BaseDir = NativeLibrary.GetUserDirectory(); String ConfigDir = BaseDir + File.separator + "Config"; - String GCDir = BaseDir + File.separator + "GC"; // Copy assets if needed - File file = new File(GCDir + File.separator + "font_sjis.bin"); + File file = new File(BaseDir + File.separator + "GC" + File.separator + "font_sjis.bin"); if(!file.exists()) { NativeLibrary.CreateUserFolders(); - copyAsset("dsp_coef.bin", GCDir + File.separator + "dsp_coef.bin"); - 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"); + copyAssetFolder("GC", BaseDir + File.separator + "GC"); copyAssetFolder("Shaders", BaseDir + File.separator + "Shaders"); + copyAssetFolder("Wii", BaseDir + File.separator + "Wii"); } else { diff --git a/Source/Android/jni/CMakeLists.txt b/Source/Android/jni/CMakeLists.txt index 78dbe65db7..b8f0cb865e 100644 --- a/Source/Android/jni/CMakeLists.txt +++ b/Source/Android/jni/CMakeLists.txt @@ -26,7 +26,10 @@ add_custom_command(TARGET ${SHARED_LIB} POST_BUILD COMMAND ${CMAKE_STRIP} ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/jniLibs/${ANDROID_NDK_ABI_NAME}/lib${SHARED_LIB}.so ) add_custom_command(TARGET ${SHARED_LIB} POST_BUILD - COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/GC/* ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/ + COMMAND cp ARGS -r ${CMAKE_SOURCE_DIR}/Data/Sys/GC ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/ +) +add_custom_command(TARGET ${SHARED_LIB} POST_BUILD + COMMAND cp ARGS -r ${CMAKE_SOURCE_DIR}/Data/Sys/Wii ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/ ) add_custom_command(TARGET ${SHARED_LIB} POST_BUILD COMMAND cp ARGS -r ${CMAKE_SOURCE_DIR}/Data/Sys/Shaders ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/ |