piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move global User/Wii to Sys/Wii

Browse Source
This commit is contained in:
Pierre Bourdon 2013-09-12 03:32:03 +02:00
parent e7213ca4b1
commit c3eec379df
18 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Data/Sys/Wii/setting-kor.txt
View File

Binary file not shown.

0
Data/User/Wii/shared2/ec/shopsetu.log → Data/Sys/Wii/shared2/ec/shopsetu.log
View File

0
Data/User/Wii/shared2/succession/shop.log → Data/Sys/Wii/shared2/succession/shop.log
View File

0
Data/User/Wii/shared2/sys/SYSCONF → Data/Sys/Wii/shared2/sys/SYSCONF
View File

0
Data/User/Wii/shared2/wc24/mbox/Readme.txt → Data/Sys/Wii/shared2/wc24/mbox/Readme.txt
View File

0
Data/User/Wii/shared2/wc24/mbox/wc24recv.ctl → Data/Sys/Wii/shared2/wc24/mbox/wc24recv.ctl
View File

0
Data/User/Wii/shared2/wc24/mbox/wc24recv.mbx → Data/Sys/Wii/shared2/wc24/mbox/wc24recv.mbx
View File

0
Data/User/Wii/shared2/wc24/mbox/wc24send.ctl → Data/Sys/Wii/shared2/wc24/mbox/wc24send.ctl
View File

0
Data/User/Wii/shared2/wc24/mbox/wc24send.mbx → Data/Sys/Wii/shared2/wc24/mbox/wc24send.mbx
View File

0
Data/User/Wii/shared2/wc24/misc.bin → Data/Sys/Wii/shared2/wc24/misc.bin
View File

0
Data/User/Wii/shared2/wc24/nwc24dl.bin → Data/Sys/Wii/shared2/wc24/nwc24dl.bin
View File

0
Data/User/Wii/shared2/wc24/nwc24fl.bin → Data/Sys/Wii/shared2/wc24/nwc24fl.bin
View File

0
Data/User/Wii/shared2/wc24/nwc24fls.bin → Data/Sys/Wii/shared2/wc24/nwc24fls.bin
View File

0
Data/User/Wii/shared2/wc24/nwc24msg.cbk → Data/Sys/Wii/shared2/wc24/nwc24msg.cbk
View File

0
Data/User/Wii/shared2/wc24/nwc24msg.cfg → Data/Sys/Wii/shared2/wc24/nwc24msg.cfg
View File

7
Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
View File

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

3
Source/Core/DolphinWX/CMakeLists.txt
View File

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

9
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -249,12 +249,13 @@ bool DolphinApp::OnInit()
} }
#endif #endif
//create all necessary directories in user directory // Copy initial Wii NAND data from Sys to User.
//TODO : detect the revision and upgrade where necessary 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::CopyDir(std::string(SHARED_USER_DIR GAMECONFIG_DIR DIR_SEP),
File::GetUserPath(D_GAMECONFIG_IDX)); 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::CopyDir(std::string(SHARED_USER_DIR OPENCL_DIR DIR_SEP),
File::GetUserPath(D_OPENCL_IDX)); File::GetUserPath(D_OPENCL_IDX));