Move global User/Wii to Sys/Wii

Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java

@@ -64,10 +64,9 @@ public final class DolphinEmulator extends Activity
 			String BaseDir = Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu";
 			String ConfigDir = BaseDir + File.separator + "Config";
 			String GCDir = BaseDir + File.separator + "GC";
-			String WiiDir = BaseDir + File.separator + "Wii";
 
 			// Copy assets if needed
-			File file = new File(WiiDir + File.separator + "setting-usa.txt");
+			File file = new File(GCDir + File.separator + "font_sjis.bin");
 			if(!file.exists())
 			{
 				NativeLibrary.CreateUserFolders();
@@ -81,10 +80,6 @@ public final class DolphinEmulator extends Activity
 				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");
-				CopyAsset("setting-eur.txt", WiiDir + File.separator + "setting-eur.txt");
-				CopyAsset("setting-jpn.txt", WiiDir + File.separator + "setting-jpn.txt");
-				CopyAsset("setting-kor.txt", WiiDir + File.separator + "setting-kor.txt");
-				CopyAsset("setting-usa.txt", WiiDir + File.separator + "setting-usa.txt");
 			}
 
 			// Load the configuration keys set in the Dolphin ini and gfx ini files

Source/Core/DolphinWX/CMakeLists.txt

@@ -212,9 +212,6 @@ if(ANDROID)
 	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
 		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/GC/* ${CMAKE_SOURCE_DIR}/Source/Android/assets/
 	)
-	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
-		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/Wii/* ${CMAKE_SOURCE_DIR}/Source/Android/assets/
-	)
 else()
 	add_executable(${DOLPHIN_EXE} ${SRCS})
 	target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS})

Source/Core/DolphinWX/Src/Main.cpp

@@ -249,12 +249,13 @@ bool DolphinApp::OnInit()
 	}
 #endif
 
-	//create all necessary directories in user directory
-	//TODO : detect the revision and upgrade where necessary
+	// Copy initial Wii NAND data from Sys to User.
+	File::CopyDir(File::GetSysDirectory() + WII_USER_DIR,
+	              File::GetUserPath(D_WIIUSER_IDX));
+
+	// TODO: replace these with overlays
 	File::CopyDir(std::string(SHARED_USER_DIR GAMECONFIG_DIR DIR_SEP),
 			File::GetUserPath(D_GAMECONFIG_IDX));
-	File::CopyDir(std::string(SHARED_USER_DIR WII_USER_DIR DIR_SEP),
-			File::GetUserPath(D_WIIUSER_IDX));
 	File::CopyDir(std::string(SHARED_USER_DIR OPENCL_DIR DIR_SEP),
 			File::GetUserPath(D_OPENCL_IDX));