From c3eec379df65ebedfbfce614dee8517c149da0a2 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 12 Sep 2013 03:32:03 +0200 Subject: Move global User/Wii to Sys/Wii --- Data/Sys/Wii/setting-kor.txt | Bin 256 -> 0 bytes Data/Sys/Wii/shared2/ec/shopsetu.log | Bin 0 -> 32 bytes Data/Sys/Wii/shared2/succession/shop.log | Bin 0 -> 32 bytes Data/Sys/Wii/shared2/sys/SYSCONF | Bin 0 -> 16384 bytes Data/Sys/Wii/shared2/wc24/mbox/Readme.txt | 4 ++++ Data/Sys/Wii/shared2/wc24/mbox/wc24recv.ctl | Bin 0 -> 32768 bytes Data/Sys/Wii/shared2/wc24/mbox/wc24recv.mbx | Bin 0 -> 48 bytes Data/Sys/Wii/shared2/wc24/mbox/wc24send.ctl | Bin 0 -> 16384 bytes Data/Sys/Wii/shared2/wc24/mbox/wc24send.mbx | Bin 0 -> 48 bytes Data/Sys/Wii/shared2/wc24/misc.bin | Bin 0 -> 1024 bytes Data/Sys/Wii/shared2/wc24/nwc24dl.bin | Bin 0 -> 63488 bytes Data/Sys/Wii/shared2/wc24/nwc24fl.bin | Bin 0 -> 32864 bytes Data/Sys/Wii/shared2/wc24/nwc24fls.bin | Bin 0 -> 12800 bytes Data/Sys/Wii/shared2/wc24/nwc24msg.cbk | Bin 0 -> 1024 bytes Data/Sys/Wii/shared2/wc24/nwc24msg.cfg | Bin 0 -> 1024 bytes Data/User/Wii/shared2/ec/shopsetu.log | Bin 32 -> 0 bytes Data/User/Wii/shared2/succession/shop.log | Bin 32 -> 0 bytes Data/User/Wii/shared2/sys/SYSCONF | Bin 16384 -> 0 bytes Data/User/Wii/shared2/wc24/mbox/Readme.txt | 4 ---- Data/User/Wii/shared2/wc24/mbox/wc24recv.ctl | Bin 32768 -> 0 bytes Data/User/Wii/shared2/wc24/mbox/wc24recv.mbx | Bin 48 -> 0 bytes Data/User/Wii/shared2/wc24/mbox/wc24send.ctl | Bin 16384 -> 0 bytes Data/User/Wii/shared2/wc24/mbox/wc24send.mbx | Bin 48 -> 0 bytes Data/User/Wii/shared2/wc24/misc.bin | Bin 1024 -> 0 bytes Data/User/Wii/shared2/wc24/nwc24dl.bin | Bin 63488 -> 0 bytes Data/User/Wii/shared2/wc24/nwc24fl.bin | Bin 32864 -> 0 bytes Data/User/Wii/shared2/wc24/nwc24fls.bin | Bin 12800 -> 0 bytes Data/User/Wii/shared2/wc24/nwc24msg.cbk | Bin 1024 -> 0 bytes Data/User/Wii/shared2/wc24/nwc24msg.cfg | Bin 1024 -> 0 bytes .../src/org/dolphinemu/dolphinemu/DolphinEmulator.java | 7 +------ Source/Core/DolphinWX/CMakeLists.txt | 3 --- Source/Core/DolphinWX/Src/Main.cpp | 9 +++++---- 32 files changed, 10 insertions(+), 17 deletions(-) delete mode 100644 Data/Sys/Wii/setting-kor.txt create mode 100644 Data/Sys/Wii/shared2/ec/shopsetu.log create mode 100644 Data/Sys/Wii/shared2/succession/shop.log create mode 100644 Data/Sys/Wii/shared2/sys/SYSCONF create mode 100644 Data/Sys/Wii/shared2/wc24/mbox/Readme.txt create mode 100644 Data/Sys/Wii/shared2/wc24/mbox/wc24recv.ctl create mode 100644 Data/Sys/Wii/shared2/wc24/mbox/wc24recv.mbx create mode 100644 Data/Sys/Wii/shared2/wc24/mbox/wc24send.ctl create mode 100644 Data/Sys/Wii/shared2/wc24/mbox/wc24send.mbx create mode 100644 Data/Sys/Wii/shared2/wc24/misc.bin create mode 100644 Data/Sys/Wii/shared2/wc24/nwc24dl.bin create mode 100644 Data/Sys/Wii/shared2/wc24/nwc24fl.bin create mode 100644 Data/Sys/Wii/shared2/wc24/nwc24fls.bin create mode 100644 Data/Sys/Wii/shared2/wc24/nwc24msg.cbk create mode 100644 Data/Sys/Wii/shared2/wc24/nwc24msg.cfg delete mode 100644 Data/User/Wii/shared2/ec/shopsetu.log delete mode 100644 Data/User/Wii/shared2/succession/shop.log delete mode 100644 Data/User/Wii/shared2/sys/SYSCONF delete mode 100644 Data/User/Wii/shared2/wc24/mbox/Readme.txt delete mode 100644 Data/User/Wii/shared2/wc24/mbox/wc24recv.ctl delete mode 100644 Data/User/Wii/shared2/wc24/mbox/wc24recv.mbx delete mode 100644 Data/User/Wii/shared2/wc24/mbox/wc24send.ctl delete mode 100644 Data/User/Wii/shared2/wc24/mbox/wc24send.mbx delete mode 100644 Data/User/Wii/shared2/wc24/misc.bin delete mode 100644 Data/User/Wii/shared2/wc24/nwc24dl.bin delete mode 100644 Data/User/Wii/shared2/wc24/nwc24fl.bin delete mode 100644 Data/User/Wii/shared2/wc24/nwc24fls.bin delete mode 100644 Data/User/Wii/shared2/wc24/nwc24msg.cbk delete mode 100644 Data/User/Wii/shared2/wc24/nwc24msg.cfg diff --git a/Data/Sys/Wii/setting-kor.txt b/Data/Sys/Wii/setting-kor.txt deleted file mode 100644 index 8c04855554..0000000000 Binary files a/Data/Sys/Wii/setting-kor.txt and /dev/null differ diff --git a/Data/Sys/Wii/shared2/ec/shopsetu.log b/Data/Sys/Wii/shared2/ec/shopsetu.log new file mode 100644 index 0000000000..4e4e493570 Binary files /dev/null and b/Data/Sys/Wii/shared2/ec/shopsetu.log differ diff --git a/Data/Sys/Wii/shared2/succession/shop.log b/Data/Sys/Wii/shared2/succession/shop.log new file mode 100644 index 0000000000..4e4e493570 Binary files /dev/null and b/Data/Sys/Wii/shared2/succession/shop.log differ diff --git a/Data/Sys/Wii/shared2/sys/SYSCONF b/Data/Sys/Wii/shared2/sys/SYSCONF new file mode 100644 index 0000000000..283c84a7e4 Binary files /dev/null and b/Data/Sys/Wii/shared2/sys/SYSCONF differ diff --git a/Data/Sys/Wii/shared2/wc24/mbox/Readme.txt b/Data/Sys/Wii/shared2/wc24/mbox/Readme.txt new file mode 100644 index 0000000000..6813fc73c1 --- /dev/null +++ b/Data/Sys/Wii/shared2/wc24/mbox/Readme.txt @@ -0,0 +1,4 @@ +The Mailbox here has been shrunk, the real file size: + +WC24RECV.MBX 0x00700000 +WC24SEND.MBX 0x00200000 diff --git a/Data/Sys/Wii/shared2/wc24/mbox/wc24recv.ctl b/Data/Sys/Wii/shared2/wc24/mbox/wc24recv.ctl new file mode 100644 index 0000000000..a4880f368a Binary files /dev/null and b/Data/Sys/Wii/shared2/wc24/mbox/wc24recv.ctl differ diff --git a/Data/Sys/Wii/shared2/wc24/mbox/wc24recv.mbx b/Data/Sys/Wii/shared2/wc24/mbox/wc24recv.mbx new file mode 100644 index 0000000000..81cd383a97 Binary files /dev/null and b/Data/Sys/Wii/shared2/wc24/mbox/wc24recv.mbx differ diff --git a/Data/Sys/Wii/shared2/wc24/mbox/wc24send.ctl b/Data/Sys/Wii/shared2/wc24/mbox/wc24send.ctl new file mode 100644 index 0000000000..165daf72b3 Binary files /dev/null and b/Data/Sys/Wii/shared2/wc24/mbox/wc24send.ctl differ diff --git a/Data/Sys/Wii/shared2/wc24/mbox/wc24send.mbx b/Data/Sys/Wii/shared2/wc24/mbox/wc24send.mbx new file mode 100644 index 0000000000..d4474476fe Binary files /dev/null and b/Data/Sys/Wii/shared2/wc24/mbox/wc24send.mbx differ diff --git a/Data/Sys/Wii/shared2/wc24/misc.bin b/Data/Sys/Wii/shared2/wc24/misc.bin new file mode 100644 index 0000000000..b2183037a2 Binary files /dev/null and b/Data/Sys/Wii/shared2/wc24/misc.bin differ diff --git a/Data/Sys/Wii/shared2/wc24/nwc24dl.bin b/Data/Sys/Wii/shared2/wc24/nwc24dl.bin new file mode 100644 index 0000000000..b7f8fa3ed7 Binary files /dev/null and b/Data/Sys/Wii/shared2/wc24/nwc24dl.bin differ diff --git a/Data/Sys/Wii/shared2/wc24/nwc24fl.bin b/Data/Sys/Wii/shared2/wc24/nwc24fl.bin new file mode 100644 index 0000000000..faa12b07ae Binary files /dev/null and b/Data/Sys/Wii/shared2/wc24/nwc24fl.bin differ diff --git a/Data/Sys/Wii/shared2/wc24/nwc24fls.bin b/Data/Sys/Wii/shared2/wc24/nwc24fls.bin new file mode 100644 index 0000000000..1ca2191a9b Binary files /dev/null and b/Data/Sys/Wii/shared2/wc24/nwc24fls.bin differ diff --git a/Data/Sys/Wii/shared2/wc24/nwc24msg.cbk b/Data/Sys/Wii/shared2/wc24/nwc24msg.cbk new file mode 100644 index 0000000000..c87fb77301 Binary files /dev/null and b/Data/Sys/Wii/shared2/wc24/nwc24msg.cbk differ diff --git a/Data/Sys/Wii/shared2/wc24/nwc24msg.cfg b/Data/Sys/Wii/shared2/wc24/nwc24msg.cfg new file mode 100644 index 0000000000..c87fb77301 Binary files /dev/null and b/Data/Sys/Wii/shared2/wc24/nwc24msg.cfg differ diff --git a/Data/User/Wii/shared2/ec/shopsetu.log b/Data/User/Wii/shared2/ec/shopsetu.log deleted file mode 100644 index 4e4e493570..0000000000 Binary files a/Data/User/Wii/shared2/ec/shopsetu.log and /dev/null differ diff --git a/Data/User/Wii/shared2/succession/shop.log b/Data/User/Wii/shared2/succession/shop.log deleted file mode 100644 index 4e4e493570..0000000000 Binary files a/Data/User/Wii/shared2/succession/shop.log and /dev/null differ diff --git a/Data/User/Wii/shared2/sys/SYSCONF b/Data/User/Wii/shared2/sys/SYSCONF deleted file mode 100644 index 283c84a7e4..0000000000 Binary files a/Data/User/Wii/shared2/sys/SYSCONF and /dev/null differ diff --git a/Data/User/Wii/shared2/wc24/mbox/Readme.txt b/Data/User/Wii/shared2/wc24/mbox/Readme.txt deleted file mode 100644 index 6813fc73c1..0000000000 --- a/Data/User/Wii/shared2/wc24/mbox/Readme.txt +++ /dev/null @@ -1,4 +0,0 @@ -The Mailbox here has been shrunk, the real file size: - -WC24RECV.MBX 0x00700000 -WC24SEND.MBX 0x00200000 diff --git a/Data/User/Wii/shared2/wc24/mbox/wc24recv.ctl b/Data/User/Wii/shared2/wc24/mbox/wc24recv.ctl deleted file mode 100644 index a4880f368a..0000000000 Binary files a/Data/User/Wii/shared2/wc24/mbox/wc24recv.ctl and /dev/null differ diff --git a/Data/User/Wii/shared2/wc24/mbox/wc24recv.mbx b/Data/User/Wii/shared2/wc24/mbox/wc24recv.mbx deleted file mode 100644 index 81cd383a97..0000000000 Binary files a/Data/User/Wii/shared2/wc24/mbox/wc24recv.mbx and /dev/null differ diff --git a/Data/User/Wii/shared2/wc24/mbox/wc24send.ctl b/Data/User/Wii/shared2/wc24/mbox/wc24send.ctl deleted file mode 100644 index 165daf72b3..0000000000 Binary files a/Data/User/Wii/shared2/wc24/mbox/wc24send.ctl and /dev/null differ diff --git a/Data/User/Wii/shared2/wc24/mbox/wc24send.mbx b/Data/User/Wii/shared2/wc24/mbox/wc24send.mbx deleted file mode 100644 index d4474476fe..0000000000 Binary files a/Data/User/Wii/shared2/wc24/mbox/wc24send.mbx and /dev/null differ diff --git a/Data/User/Wii/shared2/wc24/misc.bin b/Data/User/Wii/shared2/wc24/misc.bin deleted file mode 100644 index b2183037a2..0000000000 Binary files a/Data/User/Wii/shared2/wc24/misc.bin and /dev/null differ diff --git a/Data/User/Wii/shared2/wc24/nwc24dl.bin b/Data/User/Wii/shared2/wc24/nwc24dl.bin deleted file mode 100644 index b7f8fa3ed7..0000000000 Binary files a/Data/User/Wii/shared2/wc24/nwc24dl.bin and /dev/null differ diff --git a/Data/User/Wii/shared2/wc24/nwc24fl.bin b/Data/User/Wii/shared2/wc24/nwc24fl.bin deleted file mode 100644 index faa12b07ae..0000000000 Binary files a/Data/User/Wii/shared2/wc24/nwc24fl.bin and /dev/null differ diff --git a/Data/User/Wii/shared2/wc24/nwc24fls.bin b/Data/User/Wii/shared2/wc24/nwc24fls.bin deleted file mode 100644 index 1ca2191a9b..0000000000 Binary files a/Data/User/Wii/shared2/wc24/nwc24fls.bin and /dev/null differ diff --git a/Data/User/Wii/shared2/wc24/nwc24msg.cbk b/Data/User/Wii/shared2/wc24/nwc24msg.cbk deleted file mode 100644 index c87fb77301..0000000000 Binary files a/Data/User/Wii/shared2/wc24/nwc24msg.cbk and /dev/null differ diff --git a/Data/User/Wii/shared2/wc24/nwc24msg.cfg b/Data/User/Wii/shared2/wc24/nwc24msg.cfg deleted file mode 100644 index c87fb77301..0000000000 Binary files a/Data/User/Wii/shared2/wc24/nwc24msg.cfg and /dev/null differ diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java index 6703c5710c..07bfaf8a63 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java +++ b/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 diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index cf75db6a75..5a5a836b65 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/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}) diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 7ba77501c0..eac7be46b3 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/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)); -- cgit v1.2.3