piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 17:19:44 -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

10
Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.cpp
View File

@ -86,7 +86,7 @@ CDebugger::CDebugger(wxWindow *parent, wxWindowID id, const wxString &title,
// load ini...
IniFile file;
file.Load("Debugger.ini");
file.Load(DEBUGGER_CONFIG_FILE);
this->Load(file);
}
@ -94,9 +94,9 @@ CDebugger::~CDebugger()
{
// empty
IniFile file;
file.Load("Debugger.ini");
file.Load(DEBUGGER_CONFIG_FILE);
this->Save(file);
file.Save("Debugger.ini");
file.Save(DEBUGGER_CONFIG_FILE);
}
void CDebugger::Save(IniFile& _IniFile) const
@ -426,9 +426,9 @@ void CDebugger::OnClose(wxCloseEvent& /*event*/)
{
// save the window position when we hide the window to
IniFile file;
file.Load("Debugger.ini");
file.Load(DEBUGGER_CONFIG_FILE);
this->Save(file);
file.Save("Debugger.ini");
file.Save(DEBUGGER_CONFIG_FILE);
EndModal(0);

4
Source/Plugins/Plugin_DSP_LLE/Src/main.cpp
View File

@ -235,14 +235,14 @@ void DSP_Initialize(DSPInitialize _dspInitialize)
g_dsp.irq_request = dspi_req_dsp_irq;
gdsp_reset();
if (!gdsp_load_rom((char *)"data\\dsp_rom.bin"))
if (!gdsp_load_rom((char *)DSP_ROM_FILE))
{
bCanWork = false;
PanicAlert("No DSP ROM");
ErrorLog("Cannot load DSP ROM\n");
}
if (!gdsp_load_coef((char *)"data\\dsp_coef.bin"))
if (!gdsp_load_coef((char *)DSP_COEF_FILE))
{
bCanWork = false;
PanicAlert("No DSP COEF");

6
Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Version="9.00"
Name="Plugin_PadSimple"
ProjectGUID="{9A183B48-ECC2-4121-876A-9B3793686073}"
RootNamespace="Plugin_PadSimple"
@ -758,6 +758,10 @@
RelativePath="..\..\PluginSpecs\pluginspecs_pad.h"
>
</File>
<File
RelativePath=".\Src\SConscript"
>
</File>
<File
RelativePath=".\Src\stdafx.cpp"
>

6
Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
View File

@ -628,7 +628,7 @@ void LoadConfig()
};
#endif
IniFile file;
file.Load("pad.ini");
file.Load(FULL_CONFIG_DIR "pad.ini");
for(int i = 0; i < 4; i++)
{
@ -658,7 +658,7 @@ void LoadConfig()
void SaveConfig()
{
IniFile file;
file.Load("pad.ini");
file.Load(FULL_CONFIG_DIR "pad.ini");
for(int i = 0; i < 4; i++)
{
@ -676,7 +676,7 @@ void SaveConfig()
file.Set(SectionName, controlNames[x], pad[i].keyForControl[x]);
}
}
file.Save("pad.ini");
file.Save(FULL_CONFIG_DIR "pad.ini");
}

6
Source/Plugins/Plugin_VideoDX9/Src/Config.cpp
View File

@ -27,7 +27,7 @@ Config::Config()
void Config::Load()
{
IniFile iniFile;
iniFile.Load("gfx_dx9.ini");
iniFile.Load(FULL_CONFIG_DIR "gfx_dx9.ini");
iniFile.Get("Hardware", "Adapter", &iAdapter, 0);
iniFile.Get("Hardware", "WindowedRes", &iWindowedRes, 0);
iniFile.Get("Hardware", "FullscreenRes", &iFSResolution, 0);
@ -56,7 +56,7 @@ void Config::Load()
void Config::Save()
{
IniFile iniFile;
iniFile.Load("gfx_dx9.ini");
iniFile.Load(FULL_CONFIG_DIR "gfx_dx9.ini");
iniFile.Set("Hardware", "Adapter", iAdapter);
iniFile.Set("Hardware", "WindowedRes", iWindowedRes);
iniFile.Set("Hardware", "FullscreenRes", iFSResolution);
@ -78,5 +78,5 @@ void Config::Save()
iniFile.Set("Enhancements", "ForceFiltering", bForceFiltering);
iniFile.Set("Enhancements", "ForceMaxAniso", bForceMaxAniso);
iniFile.Save("gfx_dx9.ini");
iniFile.Save(FULL_CONFIG_DIR "gfx_dx9.ini");
}

6
Source/Plugins/Plugin_VideoOGL/Src/Config.cpp
View File

@ -31,7 +31,7 @@ void Config::Load()
{
std::string temp;
IniFile iniFile;
iniFile.Load("gfx_opengl.ini");
iniFile.Load(FULL_CONFIG_DIR "gfx_opengl.ini");
// get resolution
iniFile.Get("Hardware", "WindowedRes", &temp, 0);
@ -82,7 +82,7 @@ void Config::Load()
void Config::Save()
{
IniFile iniFile;
iniFile.Load("gfx_opengl.ini");
iniFile.Load(FULL_CONFIG_DIR "gfx_opengl.ini");
iniFile.Set("Hardware", "WindowedRes", iWindowedRes);
iniFile.Set("Hardware", "FullscreenRes", iFSResolution);
iniFile.Set("Hardware", "Fullscreen", bFullscreen);
@ -110,5 +110,5 @@ void Config::Save()
iniFile.Set("Hacks", "EFBToTextureDisable", bEBFToTextureDisable);
iniFile.Save("gfx_opengl.ini");
iniFile.Save(FULL_CONFIG_DIR "gfx_opengl.ini");
}

10
Source/Plugins/Plugin_VideoOGL/Src/Debugger/Debugger.cpp
View File

@ -56,7 +56,7 @@ CDebugger::CDebugger(wxWindow *parent, wxWindowID id, const wxString &title,
// load ini...
IniFile file;
file.Load("Debugger.ini");
file.Load(DEBUGGER_CONFIG_FILE);
this->Load(file);
}
@ -64,9 +64,9 @@ CDebugger::~CDebugger()
{
// empty
IniFile file;
file.Load("Debugger.ini");
file.Load(DEBUGGER_CONFIG_FILE);
this->Save(file);
file.Save("Debugger.ini");
file.Save(DEBUGGER_CONFIG_FILE);
}
void CDebugger::Save(IniFile& _IniFile) const
@ -276,9 +276,9 @@ void CDebugger::OnClose(wxCloseEvent& /*event*/)
{
// save the window position when we hide the window to
IniFile file;
file.Load("Debugger.ini");
file.Load(DEBUGGER_CONFIG_FILE);
this->Save(file);
file.Save("Debugger.ini");
file.Save(DEBUGGER_CONFIG_FILE);
EndModal(0); // it seems like this works for Show() to, not just ShowModal();

2
Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp
View File

@ -218,7 +218,7 @@ namespace EmuWindow
// started so we have to use an ini file setting here
bool bVideoWindow = false;
IniFile ini;
ini.Load("Debugger.ini");
ini.Load(DEBUGGER_CONFIG_FILE);
ini.Get("ShowOnStart", "VideoWindow", &bVideoWindow, false);
if(bVideoWindow) DoDllDebugger();
}

6
Source/Plugins/Plugin_Wiimote_Test/Plugin_Wiimote_Test.vcproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Version="9.00"
Name="Plugin_Wiimote"
ProjectGUID="{8D612734-FAA5-4B8A-804F-4DEA2367D495}"
RootNamespace="Plugin_Wiimote_Test"
@ -537,6 +537,10 @@
RelativePath=".\Src\main.cpp"
>
</File>
<File
RelativePath=".\Src\SConscript"
>
</File>
<File
RelativePath=".\Src\wiimote_emu.cpp"
>

6
Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Version="9.00"
Name="Plugin_nJoy_SDL"
ProjectGUID="{521498BE-6089-4780-8223-E67C22F4E068}"
RootNamespace="Plugin_nJoy_SDL"
@ -540,6 +540,10 @@
RelativePath=".\readme.txt"
>
</File>
<File
RelativePath=".\Src\SConscript"
>
</File>
</Files>
<Globals>
</Globals>