piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 15:19:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Migration to the new dir struct (in code only!, no deletion of old dirs...yet). VS projects copy Data/* to Binary/<arch>. Added SConscript to some projects where it was missing. This is the time to move over all your files!

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1140 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2008-11-12 04:54:17 +00:00
parent 8c7d7a6c36
commit f7cb34f1e0
30 changed files with 218 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/DolphinWX/DolphinWX.vcproj
View File

@ -126,6 +126,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description="Copying Data\* to $(TargetDir)"
CommandLine="xcopy $(SolutionDir)..\Data $(TargetDir) /s /e /q /y"
/>
</Configuration>
<Configuration
@ -235,6 +237,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description="Copying Data\* to $(TargetDir)"
CommandLine="xcopy $(SolutionDir)..\Data $(TargetDir) /s /e /q /y"
/>
</Configuration>
<Configuration
@ -342,6 +346,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description="Copying Data\* to $(TargetDir)"
CommandLine="xcopy $(SolutionDir)..\Data $(TargetDir) /s /e /q /y"
/>
</Configuration>
<Configuration
@ -449,6 +455,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description="Copying Data\* to $(TargetDir)"
CommandLine="xcopy $(SolutionDir)..\Data $(TargetDir) /s /e /q /y"
/>
</Configuration>
<Configuration
@ -558,6 +566,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description="Copying Data\* to $(TargetDir)"
CommandLine="xcopy $(SolutionDir)..\Data $(TargetDir) /s /e /q /y"
/>
</Configuration>
<Configuration
@ -665,6 +675,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description="Copying Data\* to $(TargetDir)"
CommandLine="xcopy $(SolutionDir)..\Data $(TargetDir) /s /e /q /y"
/>
</Configuration>
</Configurations>
@ -891,6 +903,10 @@
RelativePath=".\resource.h"
>
</File>
<File
RelativePath=".\Src\SConscript"
>
</File>
<File
RelativePath=".\src\stdafx.cpp"
>

2
Source/Core/DolphinWX/Src/BootManager.cpp
View File

@ -87,7 +87,7 @@ bool BootCore(const std::string& _rFilename)
// Load overrides
IniFile ini;
std::string unique_id = StartUp.GetUniqueID();
if (unique_id.size() == 6 && ini.Load(("GameIni/" + unique_id + ".ini").c_str()))
if (unique_id.size() == 6 && ini.Load((FULL_GAMECONFIG_DIR + unique_id + ".ini").c_str()))
{
ini.Get("Core", "UseDualCore", &StartUp.bUseDualCore, StartUp.bUseDualCore);
ini.Get("Core", "SkipIdle", &StartUp.bSkipIdle, StartUp.bSkipIdle);

4
Source/Core/DolphinWX/Src/ConfigMain.cpp
View File

@ -64,7 +64,7 @@ CConfigMain::CConfigMain(wxWindow* parent, wxWindowID id, const wxString& title,
// Load Wii SYSCONF
pStream = NULL;
pStream = fopen("./WII/shared2/sys/SYSCONF", "rb");
pStream = fopen(FULL_WII_USER_DIR "shared2/sys/SYSCONF", "rb");
if (pStream != NULL)
{
fread(m_SYSCONF, 1, 0x4000, pStream);
@ -307,7 +307,7 @@ void CConfigMain::OnClose(wxCloseEvent& WXUNUSED (event))
// Save Wii SYSCONF
pStream = NULL;
pStream = fopen("./WII/shared2/sys/SYSCONF", "wb");
pStream = fopen(FULL_WII_USER_DIR "shared2/sys/SYSCONF", "wb");
if (pStream != NULL)
{
fwrite(m_SYSCONF, 1, 0x4000, pStream);

2
Source/Core/DolphinWX/Src/GameListCtrl.cpp
View File

@ -239,7 +239,7 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
item.SetColumn(COLUMN_EMULATION_STATE);
//NOTE (Daco): i dont like the fact of having so much ini's just to have
//the game emulation state of every game you have. but 1 huge ini is no option
GameIni = "GameIni/" + (rISOFile.GetUniqueID()) + ".ini";
GameIni = FULL_GAMECONFIG_DIR + (rISOFile.GetUniqueID()) + ".ini";
ini.Load(GameIni.c_str());
ini.Get("EmuState","EmulationStateId",&EmuState);
if (!EmuState.empty())

6
Source/Core/DolphinWX/Src/ISOFile.cpp
View File

@ -139,9 +139,9 @@ bool GameListItem::LoadFromCache()
void GameListItem::SaveToCache()
{
if (!File::IsDirectory("ISOCache"))
if (!File::IsDirectory(FULL_CACHE_DIR))
{
File::CreateDir("ISOCache");
File::CreateDir(FULL_CACHE_DIR);
}
CChunkFileReader::Save<GameListItem>(CreateCacheFilename(), CACHE_REVISION, *this);
@ -166,7 +166,7 @@ std::string GameListItem::CreateCacheFilename()
SplitPath(m_FileName, NULL, &Filename, NULL);
Filename.append(".cache");
std::string fullname("ISOCache\\");
std::string fullname(FULL_CACHE_DIR "\\");
fullname += Filename;
return fullname;
}

2
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -49,7 +49,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
bRefreshList = false;
CreateGUIControls();
GameIniFile = "GameIni/" + (OpenISO->GetUniqueID()) + ".ini";
GameIniFile = FULL_GAMECONFIG_DIR + (OpenISO->GetUniqueID()) + ".ini";
if (GameIni.Load(GameIniFile.c_str()))
LoadGameConfig();
else

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

@ -145,7 +145,7 @@ bool DolphinApp::OnInit()
// TODO: Save position and size on exit
// ---------
IniFile ini;
ini.Load("Debugger.ini");
ini.Load(DEBUGGER_CONFIG_FILE);
int x, y, w, h;

2
Source/Core/DolphinWX/Src/PluginManager.cpp
View File

@ -43,7 +43,7 @@ void CPluginManager::ScanForPlugins(wxWindow* _wxWindow)
Directories.push_back(std::string(PLUGINS_DIR));
CFileSearch::XStringVector Extensions;
Extensions.push_back("*." PLUGIN_SUFFIX);
Extensions.push_back("*" PLUGIN_SUFFIX);
CFileSearch FileSearch(Extensions, Directories);
const CFileSearch::XStringVector& rFilenames = FileSearch.GetFileNames();