just some code cleanings

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@8 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
fires.gc 2008-07-15 11:53:41 +00:00
parent 050c472b38
commit 982586cdc6
10 changed files with 100 additions and 90 deletions

View File

@ -288,7 +288,7 @@ bool CBoot::EmulatedBIOS_Wii(bool _bDebug)
for (int i=0x3000; i<=0x3038; i+=4) for (int i=0x3000; i<=0x3038; i+=4)
{ {
Memory::Write_U32(0x00000000, i); Memory::Write_U32(0x00000000, i);
} }
// app // app
VolumeHandler::ReadToPtr(Memory::GetPointer(0x3180), 0, 4); VolumeHandler::ReadToPtr(Memory::GetPointer(0x3180), 0, 4);
@ -296,7 +296,7 @@ bool CBoot::EmulatedBIOS_Wii(bool _bDebug)
} }
// apploader // apploader
if (VolumeHandler::IsValid()) if (VolumeHandler::IsValid())
{ {
UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr); UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr);
m_MSR.FP = 1; m_MSR.FP = 1;

View File

@ -141,4 +141,6 @@ bool SCoreStartupParameter::AutoSetup(EBootBios _BootBios)
m_strMemoryCardA = BaseDataPath + "/MemoryCardA.raw"; m_strMemoryCardA = BaseDataPath + "/MemoryCardA.raw";
m_strMemoryCardB = BaseDataPath + "/MemoryCardB.raw"; m_strMemoryCardB = BaseDataPath + "/MemoryCardB.raw";
m_strSRAM = BaseDataPath + "/SRAM.raw"; m_strSRAM = BaseDataPath + "/SRAM.raw";
return true;
} }

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8,00"
Name="DebuggerWX" Name="DebuggerWX"
ProjectGUID="{4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}" ProjectGUID="{4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}"
RootNamespace="DebuggerWX" RootNamespace="DebuggerWX"
@ -20,8 +20,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="2"
> >
@ -84,7 +84,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="2"
@ -149,8 +149,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -211,7 +211,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="2"
@ -274,8 +274,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="DebugFast|Win32" Name="DebugFast|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="2"
> >
@ -338,7 +338,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="DebugFast|x64" Name="DebugFast|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="2"

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8,00"
Name="wxDolphin" Name="DolphinWX"
ProjectGUID="{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}" ProjectGUID="{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}"
RootNamespace="DolphinWX" RootNamespace="DolphinWX"
> >

View File

@ -68,13 +68,13 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dsound.lib" AdditionalDependencies="dxguid.lib dsound.lib"
OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_LLE.dll" OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_LLED.dll"
LinkIncremental="2" LinkIncremental="2"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/DSP_HLE.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
ImportLibrary="$(OutDir)/DSP_HLE.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -159,9 +159,9 @@
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
AssemblyDebug="1" AssemblyDebug="1"
ProgramDatabaseFile="$(OutDir)/DSP_HLE.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
ImportLibrary="$(OutDir)/DSP_HLE.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
@ -245,10 +245,11 @@
LinkIncremental="1" LinkIncremental="1"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/DSP_HLE.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -334,10 +335,11 @@
LinkIncremental="1" LinkIncremental="1"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/DSP_HLE.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
@ -417,14 +419,15 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dsound.lib" AdditionalDependencies="dxguid.lib dsound.lib"
OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_LLE.dll" OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_LLEDF.dll"
LinkIncremental="1" LinkIncremental="1"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/DSP_HLE.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -506,14 +509,15 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dsound.lib" AdditionalDependencies="dxguid.lib dsound.lib"
OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_LEE.dll" OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_LEEDF.dll"
LinkIncremental="1" LinkIncremental="1"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/DSP_HLE.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool

View File

@ -130,7 +130,7 @@ bool CReBarSettings::Load(LPCTSTR szRegKey, LPCTSTR szPrefix, HKEY hkRootKey /*
if (err == ERROR_SUCCESS) if (err == ERROR_SUCCESS)
{ {
reg.QueryValue(m_cbBandCount, CString(szPrefix) + S_BAR_BANDCOUNT); reg.QueryDWORDValue(CString(szPrefix) + S_BAR_BANDCOUNT, m_cbBandCount);
if (m_cbBandCount > 0) if (m_cbBandCount > 0)
{ {
@ -141,11 +141,11 @@ bool CReBarSettings::Load(LPCTSTR szRegKey, LPCTSTR szPrefix, HKEY hkRootKey /*
{ {
CString s; CString s;
s.Format(_T("%s%i_"), szPrefix, i); s.Format(_T("%s%i_"), szPrefix, i);
reg.QueryValue(m_pBands[i].ID, s + S_BAR_ID_VAL); reg.QueryDWORDValue(s + S_BAR_ID_VAL, m_pBands[i].ID);
reg.QueryValue(m_pBands[i].cx, s + S_BAR_CX_VAL); reg.QueryDWORDValue(s + S_BAR_CX_VAL, m_pBands[i].cx);
DWORD dw; DWORD dw;
reg.QueryValue(dw, s + S_BAR_BREAKLINE_VAL); reg.QueryDWORDValue(s + S_BAR_BREAKLINE_VAL, dw);
m_pBands[i].BreakLine = dw != 0; m_pBands[i].BreakLine = dw != 0;
} }
} }
@ -161,17 +161,17 @@ bool CReBarSettings::Save(LPCTSTR szRegKey, LPCTSTR szPrefix, HKEY hkRootKey /*
if (err == ERROR_SUCCESS) if (err == ERROR_SUCCESS)
{ {
reg.SetValue(m_cbBandCount, CString(szPrefix) + S_BAR_BANDCOUNT); reg.SetDWORDValue(CString(szPrefix) + S_BAR_BANDCOUNT, m_cbBandCount);
for (DWORD i = 0; i < m_cbBandCount; i++) for (DWORD i = 0; i < m_cbBandCount; i++)
{ {
CString s; CString s;
s.Format(_T("%s%i_"), szPrefix, i); s.Format(_T("%s%i_"), szPrefix, i);
reg.SetValue(m_pBands[i].ID, s + S_BAR_ID_VAL); reg.SetDWORDValue(s + S_BAR_ID_VAL, m_pBands[i].ID);
reg.SetValue(m_pBands[i].cx, s + S_BAR_CX_VAL); reg.SetDWORDValue(s + S_BAR_CX_VAL, m_pBands[i].cx);
DWORD dw = m_pBands[i].BreakLine; DWORD dw = m_pBands[i].BreakLine;
reg.SetValue(dw, s + S_BAR_BREAKLINE_VAL); reg.SetDWORDValue(s + S_BAR_BREAKLINE_VAL, dw);
} }
} }
@ -249,7 +249,7 @@ bool CSplitterSettings::Load(LPCTSTR szRegKey, LPCTSTR szPrefix, HKEY hkRootKey
if (err == ERROR_SUCCESS) if (err == ERROR_SUCCESS)
{ {
reg.QueryValue(m_dwPos, CString(szPrefix) + S_SPLITTER_POS); reg.QueryDWORDValue(CString(szPrefix) + S_SPLITTER_POS, m_dwPos);
} }
return(err == ERROR_SUCCESS); return(err == ERROR_SUCCESS);
@ -263,7 +263,7 @@ bool CSplitterSettings::Save(LPCTSTR szRegKey, LPCTSTR szPrefix, HKEY hkRootKey
if (err == ERROR_SUCCESS) if (err == ERROR_SUCCESS)
{ {
reg.SetValue(m_dwPos, CString(szPrefix) + S_SPLITTER_POS); reg.SetDWORDValue(CString(szPrefix) + S_SPLITTER_POS, m_dwPos);
} }
return(err == ERROR_SUCCESS); return(err == ERROR_SUCCESS);

View File

@ -72,9 +72,9 @@
LinkIncremental="2" LinkIncremental="2"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/DSP_HLE.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
ImportLibrary="$(OutDir)/DSP_HLE.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -157,9 +157,9 @@
LinkIncremental="2" LinkIncremental="2"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/DSP_HLE.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
ImportLibrary="$(OutDir)/DSP_HLE.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
@ -245,10 +245,11 @@
LinkIncremental="1" LinkIncremental="1"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/DSP_HLE.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -335,10 +336,11 @@
LinkIncremental="1" LinkIncremental="1"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/DSP_HLE.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
@ -424,10 +426,11 @@
LinkIncremental="1" LinkIncremental="1"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/DSP_HLE.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -514,10 +517,11 @@
LinkIncremental="1" LinkIncremental="1"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/DSP_HLE.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8,00"
Name="Plugin_PadSimple" Name="Plugin_PadSimple"
ProjectGUID="{9A183B48-ECC2-4121-876A-9B3793686073}" ProjectGUID="{9A183B48-ECC2-4121-876A-9B3793686073}"
RootNamespace="Plugin_PadSimple" RootNamespace="Plugin_PadSimple"
@ -89,8 +89,8 @@
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateManifest="false" GenerateManifest="false"
ProgramDatabaseFile=".\Release/Pad_Simple.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary=".\Release/Pad_Simple.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -190,8 +190,8 @@
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateManifest="false" GenerateManifest="false"
ProgramDatabaseFile=".\Release/Pad_Simple.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary=".\Release/Pad_Simple.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
@ -287,8 +287,8 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/Pad_Simple.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary=".\Debug/Pad_Simple.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -384,8 +384,8 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/Pad_Simple.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary=".\Debug/Pad_Simple.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
@ -415,8 +415,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="DebugFast|Win32" Name="DebugFast|Win32"
OutputDirectory="$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0" UseOfMFC="0"
@ -485,8 +485,8 @@
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateManifest="false" GenerateManifest="false"
ProgramDatabaseFile=".\Release/Pad_Simple.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary=".\Release/Pad_Simple.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -586,8 +586,8 @@
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateManifest="false" GenerateManifest="false"
ProgramDatabaseFile=".\Release/Pad_Simple.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary=".\Release/Pad_Simple.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8,00"
Name="Plugin_VideoDX9" Name="Plugin_VideoDX9"
ProjectGUID="{636FAD5F-02D1-4E9A-BE67-FB8EA99B9A18}" ProjectGUID="{636FAD5F-02D1-4E9A-BE67-FB8EA99B9A18}"
RootNamespace="Plugin_VideoDX9" RootNamespace="Plugin_VideoDX9"
@ -95,8 +95,8 @@
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateManifest="false" GenerateManifest="false"
ProgramDatabaseFile=".\Release/Video_DirectX9.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary=".\Release/Video_DirectX9.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -126,7 +126,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
OutputDirectory="..\..\..\Binary\x64\Plugins\" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@ -203,8 +203,8 @@
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateManifest="false" GenerateManifest="false"
ProgramDatabaseFile=".\Release/Video_DirectX9.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary=".\Release/Video_DirectX9.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
@ -302,8 +302,8 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/Video_DirectX9.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary=".\Debug/Video_DirectX9.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -400,8 +400,8 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/Video_DirectX9.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary=".\Debug/Video_DirectX9.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
@ -431,8 +431,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="DebugFast|Win32" Name="DebugFast|Win32"
OutputDirectory="$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0" UseOfMFC="0"
@ -506,8 +506,8 @@
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateManifest="false" GenerateManifest="false"
ProgramDatabaseFile=".\Release/Video_DirectX9.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary=".\Release/Video_DirectX9.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -614,8 +614,8 @@
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateManifest="false" GenerateManifest="false"
ProgramDatabaseFile=".\Release/Video_DirectX9.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary=".\Release/Video_DirectX9.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8,00"
Name="Plugin_VideoOGL" Name="Plugin_VideoOGL"
ProjectGUID="{CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}" ProjectGUID="{CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}"
RootNamespace="Plugin_VideoOGL" RootNamespace="Plugin_VideoOGL"
@ -94,8 +94,8 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="Src\Windows\GL;Src\Windows\libjpeg;..\..\..\Externals\Cg" AdditionalLibraryDirectories="Src\Windows\GL;Src\Windows\libjpeg;..\..\..\Externals\Cg"
GenerateManifest="false" GenerateManifest="false"
ProgramDatabaseFile=".\Release/VideoOGL.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary=".\Release/VideoOGL.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -125,7 +125,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
OutputDirectory="..\..\..\Binary\x64\Plugins\" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@ -204,8 +204,8 @@
AdditionalLibraryDirectories="Src\Windows\GL;Src\Windows\libjpeg;..\..\..\Externals\Cg64" AdditionalLibraryDirectories="Src\Windows\GL;Src\Windows\libjpeg;..\..\..\Externals\Cg64"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary=".\Release/VideoOGL.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17" TargetMachine="17"
FixedBaseAddress="1" FixedBaseAddress="1"
/> />
@ -304,8 +304,8 @@
AdditionalLibraryDirectories="Src\Windows\GL;Src\Windows\libjpeg;..\..\..\Externals\Cg" AdditionalLibraryDirectories="Src\Windows\GL;Src\Windows\libjpeg;..\..\..\Externals\Cg"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/VideoOGL.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary=".\Debug/VideoOGL.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -403,9 +403,9 @@
AdditionalLibraryDirectories="Src\Windows\GL;Src\Windows\libjpeg;..\..\..\Externals\Cg64" AdditionalLibraryDirectories="Src\Windows\GL;Src\Windows\libjpeg;..\..\..\Externals\Cg64"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/VideoOGL.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
LargeAddressAware="1" LargeAddressAware="1"
ImportLibrary=".\Debug/VideoOGL.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
@ -435,8 +435,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="DebugFast|Win32" Name="DebugFast|Win32"
OutputDirectory="$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0" UseOfMFC="0"
@ -511,8 +511,8 @@
AdditionalLibraryDirectories="Src\Windows\GL;Src\Windows\libjpeg;..\..\..\Externals\Cg" AdditionalLibraryDirectories="Src\Windows\GL;Src\Windows\libjpeg;..\..\..\Externals\Cg"
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile=".\Release/VideoOGLDF.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary=".\Release/VideoOGL.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -620,8 +620,8 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="Src\Windows\GL;Src\Windows\libjpeg;..\..\..\Externals\Cg64" AdditionalLibraryDirectories="Src\Windows\GL;Src\Windows\libjpeg;..\..\..\Externals\Cg64"
GenerateManifest="false" GenerateManifest="false"
ProgramDatabaseFile=".\Release/VideoOGL.pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary=".\Release/VideoOGL.lib" ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool