diff options
| author | Glenn Rice <glennricster@gmail.com> | 2010-02-02 21:56:29 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2010-02-02 21:56:29 +0000 |
| commit | feba09f7a3e8d8e9b1ea2fe0d666c5be82941096 (patch) | |
| tree | e695da77bfbd419355df9d29c799f6722d64ccef /Source/Core/DiscIO | |
| parent | a090876bbd89ac656db2c1a5b81b778311b1c804 (diff) | |
Linux global build. At least the basic footwork is done here.
Basic usage: "sudo scons install=global install"
Hopefully this doesn't break builds on Macs. I have tested this on linux and windows.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4994 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO')
| -rw-r--r-- | Source/Core/DiscIO/Src/BannerLoaderWii.cpp | 12 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Src/NANDContentLoader.cpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp index 9108d5fcd2..aa1131c5b4 100644 --- a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp +++ b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp @@ -40,8 +40,8 @@ CBannerLoaderWii::CBannerLoaderWii(DiscIO::IVolume *pVolume) TitleID = Common::swap64(TitleID); - sprintf(Filename, FULL_WII_USER_DIR "title/%08x/%08x/data/banner.bin", - (u32)(TitleID>>32), (u32)TitleID); + sprintf(Filename, "%stitle/%08x/%08x/data/banner.bin", + File::GetUserPath(D_WIIUSER_IDX), (u32)(TitleID>>32), (u32)TitleID); if (!File::Exists(Filename)) { @@ -52,14 +52,14 @@ CBannerLoaderWii::CBannerLoaderWii(DiscIO::IVolume *pVolume) char bnrFilename[260], titleFolder[260]; // Creating title folder - sprintf(titleFolder, FULL_WII_USER_DIR "title/%08x/%08x/data/", - (u32)(TitleID>>32), (u32)TitleID); + sprintf(titleFolder, "%stitle/%08x/%08x/data/", + File::GetUserPath(D_WIIUSER_IDX), (u32)(TitleID>>32), (u32)TitleID); if(!File::Exists(titleFolder)) File::CreateFullPath(titleFolder); // Extracting banner.bin from opening.bnr - sprintf(bnrFilename, FULL_WII_USER_DIR "title/%08x/%08x/data/opening.bnr", - (u32)(TitleID>>32), (u32)TitleID); + sprintf(bnrFilename, "%stitle/%08x/%08x/data/opening.bnr", + File::GetUserPath(D_WIIUSER_IDX), (u32)(TitleID>>32), (u32)TitleID); if(!_rFileSystem.ExportFile("opening.bnr", bnrFilename)) { m_IsValid = false; diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp index 1fa3b57465..4a92b86377 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp @@ -60,7 +60,7 @@ CSharedContent CSharedContent::m_Instance; CSharedContent::CSharedContent() { char szFilename[1024]; - sprintf(szFilename, "%sshared1/content.map", FULL_WII_USER_DIR); + sprintf(szFilename, "%sshared1/content.map", File::GetUserPath(D_WIIUSER_IDX)); if (File::Exists(szFilename)) { FILE* pFile = fopen(szFilename, "rb"); @@ -86,7 +86,7 @@ std::string CSharedContent::GetFilenameFromSHA1(u8* _pHash) if (memcmp(_pHash, m_Elements[i].SHA1Hash, 20) == 0) { char szFilename[1024]; - sprintf(szFilename, "%sshared1/%c%c%c%c%c%c%c%c.app", FULL_WII_USER_DIR, + sprintf(szFilename, "%sshared1/%c%c%c%c%c%c%c%c.app", File::GetUserPath(D_WIIUSER_IDX), m_Elements[i].FileName[0], m_Elements[i].FileName[1], m_Elements[i].FileName[2], m_Elements[i].FileName[3], m_Elements[i].FileName[4], m_Elements[i].FileName[5], m_Elements[i].FileName[6], m_Elements[i].FileName[7]); return szFilename; |