diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-08-29 18:07:32 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-08-29 18:07:32 -0500 |
| commit | 96394da1c22f24026b48ee959209334384fa1c3a (patch) | |
| tree | 9f538f73c80ca2f1f732741ddc119bfbd95cec9f /Source/Android/src | |
| parent | 957c263367a9072fdc3f318e8794d726f535fa99 (diff) | |
[Android] Let NativeLibrary handle initial folder structure creation.
Diffstat (limited to 'Source/Android/src')
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java | 13 | ||||
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java | 6 |
2 files changed, 6 insertions, 13 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java index 8f8d935216..c140f28d7f 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java @@ -63,27 +63,16 @@ public final class DolphinEmulator<MainActivity> extends Activity Intent ListIntent = new Intent(this, GameListActivity.class); startActivityForResult(ListIntent, 1); - // Make the assets directory String BaseDir = Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu"; - File directory = new File(BaseDir); - directory.mkdirs(); - String ConfigDir = BaseDir + File.separator + "Config"; - directory = new File(ConfigDir); - directory.mkdirs(); - String GCDir = BaseDir + File.separator + "GC"; - directory = new File(GCDir); - directory.mkdirs(); - String WiiDir = BaseDir + File.separator + "Wii"; - directory = new File(WiiDir); - directory.mkdirs(); // Copy assets if needed File file = new File(WiiDir + File.separator + "setting-usa.txt"); if(!file.exists()) { + NativeLibrary.CreateUserFolders(); CopyAsset("ButtonA.png", BaseDir + File.separator + "ButtonA.png"); CopyAsset("ButtonB.png", BaseDir + File.separator + "ButtonB.png"); CopyAsset("ButtonStart.png", BaseDir + File.separator + "ButtonStart.png"); diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java index 0af265697a..7dbec2daf7 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java @@ -118,7 +118,11 @@ public final class NativeLibrary */ public static native void LoadState(int slot); - + /** + * Creates the initial folder structure in /sdcard/dolphin-emu/ + * + */ + public static native void CreateUserFolders(); /** * Begins emulation. |