diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2013-09-12 03:32:03 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2013-09-14 06:08:30 +0200 |
| commit | c3eec379df65ebedfbfce614dee8517c149da0a2 (patch) | |
| tree | 7ea28a9150b5b9f718186f987c10bf83d87d16de /Source/Core | |
| parent | e7213ca4b16593b676031802dd353a14a77c8a60 (diff) | |
Move global User/Wii to Sys/Wii
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/Main.cpp | 9 |
2 files changed, 5 insertions, 7 deletions
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)); |