ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

newHostVM: Sync with trunk (r3972-r3993) 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/newHostVM@3995 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-11-05 01:39:25 +00:00
parent a7726871dc 116f9ec193
commit 3bdf62fa0e
22 changed files with 537 additions and 766 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

691
bin/GameIndex.dbf
View File

File diff suppressed because it is too large Load Diff

2
common/include/Utilities/Path.h
View File

@ -53,6 +53,7 @@ public:
void Clear() { wxFileName::Clear(); } void Clear() { wxFileName::Clear(); }
wxCharBuffer ToUTF8() const { return GetPath().ToUTF8(); }
wxCharBuffer ToAscii() const { return GetPath().ToAscii(); } wxCharBuffer ToAscii() const { return GetPath().ToAscii(); }
wxString ToString() const { return GetPath(); } wxString ToString() const { return GetPath(); }
@ -131,6 +132,7 @@ namespace Path
extern wxString Normalize( const wxString& srcpath ); extern wxString Normalize( const wxString& srcpath );
extern wxString Normalize( const wxDirName& srcpath ); extern wxString Normalize( const wxDirName& srcpath );
extern wxString MakeAbsolute( const wxString& srcpath );
extern wxString Combine( const wxString& srcPath, const wxString& srcFile ); extern wxString Combine( const wxString& srcPath, const wxString& srcFile );
extern wxString Combine( const wxDirName& srcPath, const wxFileName& srcFile ); extern wxString Combine( const wxDirName& srcPath, const wxFileName& srcFile );

7
common/src/Utilities/PathUtils.cpp
View File

@ -121,6 +121,13 @@ wxString Path::Normalize( const wxDirName& src )
return wxDirName(src).Normalize().ToString(); return wxDirName(src).Normalize().ToString();
} }
wxString Path::MakeAbsolute( const wxString& src )
{
wxFileName absolute( src );
absolute.MakeAbsolute();
return absolute.GetFullPath();
}
// Concatenates two pathnames together, inserting delimiters (backslash on win32) // Concatenates two pathnames together, inserting delimiters (backslash on win32)
// as needed! Assumes the 'dest' is allocated to at least g_MaxPath length. // as needed! Assumes the 'dest' is allocated to at least g_MaxPath length.
// //

1
common/src/Utilities/VirtualMemory.cpp
View File

@ -208,7 +208,6 @@ void BaseVirtualMemoryReserve::OnPageFaultEvent(const PageFaultInfo& info, bool&
#ifndef __WXMSW__ #ifndef __WXMSW__
try { try {
#endif #endif
throw Exception::OutOfMemory( L"Right Here" );
DoCommitAndProtect( offset ); DoCommitAndProtect( offset );
handled = true; handled = true;

4
pcsx2/CDVD/CDVD.cpp
View File

@ -324,8 +324,8 @@ static __fi ElfObject* loadElf( const wxString filename )
Console.WriteLn( Color_Blue, "(LoadELF) Non-conforming version suffix detected and replaced." ); Console.WriteLn( Color_Blue, "(LoadELF) Non-conforming version suffix detected and replaced." );
IsoFSCDVD isofs; IsoFSCDVD isofs;
IsoFile file(isofs, filename); IsoFile file(isofs, fixedname);
return new ElfObject(filename, file); return new ElfObject(fixedname, file);
} }
static __fi void _reloadElfInfo(wxString elfpath) static __fi void _reloadElfInfo(wxString elfpath)

4
pcsx2/IPU/IPU.cpp
View File

@ -907,7 +907,9 @@ __noinline void IPUWorker()
ipuRegs.cmd.BUSY = 0; ipuRegs.cmd.BUSY = 0;
// CHECK!: IPU0dma remains when IDEC is done, so we need to clear it // CHECK!: IPU0dma remains when IDEC is done, so we need to clear it
//IPU_INT0_FROM(); // Check Mana Khemia 1 "off campus" to trigger a GUST IDEC messup.
// This hackfixes it :/
if (ipu0dma.qwc > 0 && ipu0dma.chcr.STR) ipu0Interrupt();
break; break;
case SCE_IPU_BDEC: case SCE_IPU_BDEC:

21
pcsx2/gui/AppCorePlugins.cpp
View File

@ -418,6 +418,8 @@ protected:
int EnumeratePluginsInFolder( const wxDirName& searchpath, wxArrayString* dest ) int EnumeratePluginsInFolder( const wxDirName& searchpath, wxArrayString* dest )
{ {
if (!searchpath.Exists()) return 0;
ScopedPtr<wxArrayString> placebo; ScopedPtr<wxArrayString> placebo;
wxArrayString* realdest = dest; wxArrayString* realdest = dest;
if( realdest == NULL ) if( realdest == NULL )
@ -432,8 +434,23 @@ int EnumeratePluginsInFolder( const wxDirName& searchpath, wxArrayString* dest )
wxString pattern( L"*%s*" ); wxString pattern( L"*%s*" );
#endif #endif
return searchpath.Exists() ? wxDir::GetAllFiles( searchpath.ToString(), realdest, pxsFmt( pattern, wxDynamicLibrary::GetDllExt()), wxDIR_FILES );
wxDir::GetAllFiles( searchpath.ToString(), realdest, wxsFormat( pattern, wxDynamicLibrary::GetDllExt()), wxDIR_FILES ) : 0;
// SECURITY ISSUE: (applies primarily to Windows, but is a good idea on any platform)
// The search folder order for plugins can vary across operating systems, and in some poorly designed
// cases (old versions of windows), the search order is a security hazard because it does not
// search where you might really expect. In our case wedo not want *any* searching. The only
// plugins we want to load are the ones we found in the directly the user specified, so make
// sure all paths are FULLY QUALIFIED ABSOLUTE PATHS.
//
// (for details, read: http://msdn.microsoft.com/en-us/library/ff919712.aspx )
for (uint i=0; i<realdest->GetCount(); ++i )
{
(*realdest)[i] = Path::MakeAbsolute((*realdest)[i]);
}
return realdest->GetCount();
} }
// Posts a message to the App to reload plugins. Plugins are loaded via a background thread // Posts a message to the App to reload plugins. Plugins are loaded via a background thread

16
pcsx2/gui/Panels/PluginSelectorPanel.cpp
View File

@ -642,8 +642,24 @@ void Panels::PluginSelectorPanel::OnConfigure_Clicked( wxCommandEvent& evt )
if( ConfigureFnptr configfunc = (ConfigureFnptr)dynlib.GetSymbol( tbl_PluginInfo[pid].GetShortname() + L"configure" ) ) if( ConfigureFnptr configfunc = (ConfigureFnptr)dynlib.GetSymbol( tbl_PluginInfo[pid].GetShortname() + L"configure" ) )
{ {
wxWindowDisabler disabler; wxWindowDisabler disabler;
ScopedCoreThreadPause paused_core( new SysExecEvent_SaveSinglePlugin(pid) ); ScopedCoreThreadPause paused_core( new SysExecEvent_SaveSinglePlugin(pid) );
if (!CorePlugins.AreLoaded())
{
typedef void (CALLBACK* SetDirFnptr)( const char* dir );
if( SetDirFnptr func = (SetDirFnptr)dynlib.GetSymbol( tbl_PluginInfo[pid].GetShortname() + L"setSettingsDir" ) )
{
func( GetSettingsFolder().ToUTF8() );
}
if( SetDirFnptr func = (SetDirFnptr)dynlib.GetSymbol( tbl_PluginInfo[pid].GetShortname() + L"setLogDir" ) )
{
func( GetLogFolder().ToUTF8() );
}
}
configfunc(); configfunc();
} }
} }

2
plugins/CDVDnull/Windows/CDVDnull_vs2008.vcproj
View File

@ -5,6 +5,7 @@
Name="CDVDnull" Name="CDVDnull"
ProjectGUID="{F38D9DF0-F68D-49D9-B3A0-932E74FB74A0}" ProjectGUID="{F38D9DF0-F68D-49D9-B3A0-932E74FB74A0}"
RootNamespace="CDVDnull" RootNamespace="CDVDnull"
TargetFrameworkVersion="0"
> >
<Platforms> <Platforms>
<Platform <Platform
@ -63,7 +64,6 @@
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
ModuleDefinitionFile=".\CDVDnull.def" ModuleDefinitionFile=".\CDVDnull.def"
RandomizedBaseAddress="1"
DataExecutionPrevention="0" DataExecutionPrevention="0"
/> />
<Tool <Tool

1
plugins/CDVDolio/cdvd_vs2008.vcproj
View File

@ -6,6 +6,7 @@
ProjectGUID="{FCDF5AE2-EA47-4CC6-9F20-23A0517FEBCB}" ProjectGUID="{FCDF5AE2-EA47-4CC6-9F20-23A0517FEBCB}"
RootNamespace="cdvd" RootNamespace="cdvd"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="0"
> >
<Platforms> <Platforms>
<Platform <Platform

6
plugins/FWnull/Windows/FWnull_vc2008.vcproj
View File

@ -54,7 +54,6 @@
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)-dbg.dll" OutputFile="$(OutDir)\$(ProjectName)-dbg.dll"
ModuleDefinitionFile="FireWireNull.def" ModuleDefinitionFile="FireWireNull.def"
RandomizedBaseAddress="1"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -117,7 +116,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
ModuleDefinitionFile="FireWireNull.def" ModuleDefinitionFile="FireWireNull.def"
RandomizedBaseAddress="1"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -164,11 +162,11 @@
Filter="h;hpp;hxx;hm;inl;inc" Filter="h;hpp;hxx;hm;inl;inc"
> >
<File <File
RelativePath="..\FW.h" RelativePath="..\Config.h"
> >
</File> </File>
<File <File
RelativePath="..\Config.h" RelativePath="..\FW.h"
> >
</File> </File>
</Filter> </Filter>

8
plugins/GSnull/Windows/GSnull_vc2008.vcproj
View File

@ -160,10 +160,6 @@
RelativePath="..\GS.cpp" RelativePath="..\GS.cpp"
> >
</File> </File>
<File
RelativePath="..\Registers.cpp"
>
</File>
<File <File
RelativePath="..\Linux\GSLinux.cpp" RelativePath="..\Linux\GSLinux.cpp"
> >
@ -192,6 +188,10 @@
RelativePath=".\GSwin.cpp" RelativePath=".\GSwin.cpp"
> >
</File> </File>
<File
RelativePath="..\Registers.cpp"
>
</File>
<File <File
RelativePath=".\Win32.cpp" RelativePath=".\Win32.cpp"
> >

507
plugins/LilyPad/LilyPad_VC2008.vcproj
View File

@ -69,7 +69,6 @@
OutputFile="$(OutDir)\$(ProjectName)-dbg.dll" OutputFile="$(OutDir)\$(ProjectName)-dbg.dll"
LinkIncremental="1" LinkIncremental="1"
ModuleDefinitionFile=".\LilyPad.def" ModuleDefinitionFile=".\LilyPad.def"
RandomizedBaseAddress="1"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -96,177 +95,6 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Release|Win32"
ConfigurationType="2"
InheritedPropertySheets=".\ProjectRootDir.vsprops;..\..\common\vsprops\BaseProperties.vsprops;..\..\common\vsprops\CodeGen_Release.vsprops"
UseOfMFC="0"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="NDEBUG;_USRDLL;TEST_EXPORTS"
ExceptionHandling="0"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="Global.h"
CallingConvention="1"
DisableSpecificWarnings="4995, 4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Setupapi.lib Winmm.lib ole32.lib advapi32.lib user32.lib kernel32.lib Comdlg32.lib dinput8.lib dxguid.lib comctl32.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile=".\LilyPad.def"
OptimizeReferences="2"
EnableCOMDATFolding="2"
EntryPointSymbol=""
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release No CRT|Win32"
ConfigurationType="2"
InheritedPropertySheets=".\ProjectRootDir.vsprops;..\..\common\vsprops\BaseProperties.vsprops;..\..\common\vsprops\CodeGen_Release.vsprops"
UseOfMFC="0"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
WholeProgramOptimization="false"
PreprocessorDefinitions="NDEBUG;_USRDLL;TEST_EXPORTS;NO_CRT"
ExceptionHandling="0"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="Global.h"
CallingConvention="1"
DisableSpecificWarnings="4995, 4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ntdll.lib Setupapi.lib Winmm.lib ole32.lib advapi32.lib user32.lib kernel32.lib Comdlg32.lib dinput8.lib dxguid.lib comctl32.lib"
OutputFile="$(OutDir)\$(ProjectName)-no CRT.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreAllDefaultLibraries="true"
ModuleDefinitionFile=".\LilyPad.def"
OptimizeReferences="2"
EnableCOMDATFolding="2"
LinkTimeCodeGeneration="0"
EntryPointSymbol="DllMain"
RandomizedBaseAddress="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
ConfigurationType="2" ConfigurationType="2"
@ -350,6 +178,89 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Release|Win32"
ConfigurationType="2"
InheritedPropertySheets=".\ProjectRootDir.vsprops;..\..\common\vsprops\BaseProperties.vsprops;..\..\common\vsprops\CodeGen_Release.vsprops"
UseOfMFC="0"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="NDEBUG;_USRDLL;TEST_EXPORTS"
ExceptionHandling="0"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="Global.h"
CallingConvention="1"
DisableSpecificWarnings="4995, 4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Setupapi.lib Winmm.lib ole32.lib advapi32.lib user32.lib kernel32.lib Comdlg32.lib dinput8.lib dxguid.lib comctl32.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile=".\LilyPad.def"
OptimizeReferences="2"
EnableCOMDATFolding="2"
EntryPointSymbol=""
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
ConfigurationType="2" ConfigurationType="2"
@ -450,6 +361,92 @@
ExcludedFromBuild="true" ExcludedFromBuild="true"
/> />
</Configuration> </Configuration>
<Configuration
Name="Release No CRT|Win32"
ConfigurationType="2"
InheritedPropertySheets=".\ProjectRootDir.vsprops;..\..\common\vsprops\BaseProperties.vsprops;..\..\common\vsprops\CodeGen_Release.vsprops"
UseOfMFC="0"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
WholeProgramOptimization="false"
PreprocessorDefinitions="NDEBUG;_USRDLL;TEST_EXPORTS;NO_CRT"
ExceptionHandling="0"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="Global.h"
CallingConvention="1"
DisableSpecificWarnings="4995, 4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ntdll.lib Setupapi.lib Winmm.lib ole32.lib advapi32.lib user32.lib kernel32.lib Comdlg32.lib dinput8.lib dxguid.lib comctl32.lib"
OutputFile="$(OutDir)\$(ProjectName)-no CRT.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreAllDefaultLibraries="true"
ModuleDefinitionFile=".\LilyPad.def"
OptimizeReferences="2"
EnableCOMDATFolding="2"
LinkTimeCodeGeneration="0"
EntryPointSymbol="DllMain"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Release No CRT|x64" Name="Release No CRT|x64"
ConfigurationType="2" ConfigurationType="2"
@ -568,6 +565,14 @@
PreprocessorDefinitions="" PreprocessorDefinitions=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|Win32" Name="Release|Win32"
> >
@ -577,23 +582,6 @@
PreprocessorDefinitions="" PreprocessorDefinitions=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release No CRT|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|x64" Name="Release|x64"
> >
@ -604,6 +592,15 @@
PreprocessorDefinitions="" PreprocessorDefinitions=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release No CRT|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release No CRT|x64" Name="Release No CRT|x64"
> >
@ -638,6 +635,14 @@
PreprocessorDefinitions="" PreprocessorDefinitions=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|Win32" Name="Release|Win32"
> >
@ -647,23 +652,6 @@
PreprocessorDefinitions="" PreprocessorDefinitions=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release No CRT|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|x64" Name="Release|x64"
> >
@ -674,6 +662,15 @@
PreprocessorDefinitions="" PreprocessorDefinitions=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release No CRT|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release No CRT|x64" Name="Release No CRT|x64"
> >
@ -701,22 +698,6 @@
UsePrecompiledHeader="1" UsePrecompiledHeader="1"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Release No CRT|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Debug|x64" Name="Debug|x64"
> >
@ -725,6 +706,14 @@
UsePrecompiledHeader="1" UsePrecompiledHeader="1"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|x64" Name="Release|x64"
> >
@ -733,6 +722,14 @@
UsePrecompiledHeader="1" UsePrecompiledHeader="1"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release No CRT|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release No CRT|x64" Name="Release No CRT|x64"
> >
@ -774,22 +771,6 @@
PreprocessorDefinitions="" PreprocessorDefinitions=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release No CRT|Win32"
>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Debug|x64" Name="Debug|x64"
> >
@ -798,6 +779,14 @@
PreprocessorDefinitions="" PreprocessorDefinitions=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|x64" Name="Release|x64"
> >
@ -806,6 +795,14 @@
PreprocessorDefinitions="" PreprocessorDefinitions=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release No CRT|Win32"
>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release No CRT|x64" Name="Release No CRT|x64"
> >
@ -934,6 +931,14 @@
PreprocessorDefinitions="" PreprocessorDefinitions=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|Win32" Name="Release|Win32"
> >
@ -943,23 +948,6 @@
PreprocessorDefinitions="" PreprocessorDefinitions=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release No CRT|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|x64" Name="Release|x64"
> >
@ -970,6 +958,15 @@
PreprocessorDefinitions="" PreprocessorDefinitions=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release No CRT|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release No CRT|x64" Name="Release No CRT|x64"
> >

2
plugins/PadNull/Windows/PadNull_vc2008.vcproj
View File

@ -56,7 +56,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
ModuleDefinitionFile="PadNull.def" ModuleDefinitionFile="PadNull.def"
RandomizedBaseAddress="1"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -123,7 +122,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
ModuleDefinitionFile="PadNull.def" ModuleDefinitionFile="PadNull.def"
RandomizedBaseAddress="1"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool

2
plugins/SSSPSXPAD/PadSSSPSX_vc2008.vcproj
View File

@ -58,7 +58,6 @@
AdditionalDependencies="user32.lib kernel32.lib dxguid.lib dinput8.lib" AdditionalDependencies="user32.lib kernel32.lib dxguid.lib dinput8.lib"
OutputFile="$(OutDir)\$(ProjectName)-dbg.dll" OutputFile="$(OutDir)\$(ProjectName)-dbg.dll"
ModuleDefinitionFile="PadSSSPSX.def" ModuleDefinitionFile="PadSSSPSX.def"
RandomizedBaseAddress="1"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -126,7 +125,6 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dinput8.lib" AdditionalDependencies="dxguid.lib dinput8.lib"
ModuleDefinitionFile="PadSSSPSX.def" ModuleDefinitionFile="PadSSSPSX.def"
RandomizedBaseAddress="1"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool

4
plugins/USBnull/Windows/USBnull_vc2008.vcproj
View File

@ -54,7 +54,6 @@
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)-dbg.dll" OutputFile="$(OutDir)\$(ProjectName)-dbg.dll"
ModuleDefinitionFile="USBnull.def" ModuleDefinitionFile="USBnull.def"
RandomizedBaseAddress="1"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -117,7 +116,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
ModuleDefinitionFile="USBnull.def" ModuleDefinitionFile="USBnull.def"
RandomizedBaseAddress="1"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -157,7 +155,7 @@
<File <File
RelativePath="..\USB.cpp" RelativePath="..\USB.cpp"
> >
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="Header Files" Name="Header Files"

10
plugins/dev9null/Windows/DEV9null_vc2008.vcproj
View File

@ -57,7 +57,6 @@
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)-dbg.dll" OutputFile="$(OutDir)\$(ProjectName)-dbg.dll"
ModuleDefinitionFile="DEV9null.def" ModuleDefinitionFile="DEV9null.def"
RandomizedBaseAddress="1"
DataExecutionPrevention="0" DataExecutionPrevention="0"
TargetMachine="1" TargetMachine="1"
/> />
@ -121,7 +120,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
ModuleDefinitionFile="DEV9null.def" ModuleDefinitionFile="DEV9null.def"
RandomizedBaseAddress="1"
DataExecutionPrevention="0" DataExecutionPrevention="0"
TargetMachine="1" TargetMachine="1"
/> />
@ -156,11 +154,11 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
> >
<File <File
RelativePath="..\DEV9.cpp" RelativePath="..\Config.cpp"
> >
</File> </File>
<File <File
RelativePath="..\Config.cpp" RelativePath="..\DEV9.cpp"
> >
</File> </File>
<File <File
@ -169,11 +167,11 @@
</File> </File>
</Filter> </Filter>
<File <File
RelativePath="..\DEV9.h" RelativePath="..\Config.h"
> >
</File> </File>
<File <File
RelativePath="..\Config.h" RelativePath="..\DEV9.h"
> >
</File> </File>
</Files> </Files>

4
plugins/spu2-x/src/Windows/Spu2-X_vs2008.vcproj
View File

@ -73,7 +73,6 @@
OutputFile="$(OutDir)\$(ProjectName)-dev.dll" OutputFile="$(OutDir)\$(ProjectName)-dev.dll"
AdditionalLibraryDirectories="$(SolutionDir)\3rdparty\portaudio" AdditionalLibraryDirectories="$(SolutionDir)\3rdparty\portaudio"
ModuleDefinitionFile=".\Spu2-X.def" ModuleDefinitionFile=".\Spu2-X.def"
RandomizedBaseAddress="1"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -155,7 +154,6 @@
OutputFile="$(OutDir)\$(ProjectName)-dbg.dll" OutputFile="$(OutDir)\$(ProjectName)-dbg.dll"
AdditionalLibraryDirectories="$(SolutionDir)\3rdparty\portaudio" AdditionalLibraryDirectories="$(SolutionDir)\3rdparty\portaudio"
ModuleDefinitionFile=".\Spu2-X.def" ModuleDefinitionFile=".\Spu2-X.def"
RandomizedBaseAddress="1"
SupportUnloadOfDelayLoadedDLL="false" SupportUnloadOfDelayLoadedDLL="false"
TargetMachine="1" TargetMachine="1"
/> />
@ -242,7 +240,6 @@
ModuleDefinitionFile=".\Spu2-X.def" ModuleDefinitionFile=".\Spu2-X.def"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
StripPrivateSymbols="" StripPrivateSymbols=""
RandomizedBaseAddress="1"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -326,7 +323,6 @@
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
ModuleDefinitionFile=".\Spu2-X.def" ModuleDefinitionFile=".\Spu2-X.def"
RandomizedBaseAddress="1"
SupportUnloadOfDelayLoadedDLL="false" SupportUnloadOfDelayLoadedDLL="false"
ImportLibrary=".\Debug/spu2-x.lib" ImportLibrary=".\Debug/spu2-x.lib"
TargetMachine="1" TargetMachine="1"

1
plugins/xpad/xpad_vs2008.vcproj
View File

@ -6,6 +6,7 @@
ProjectGUID="{6F3C4136-5801-4EBC-AC6E-37DF6FAB150A}" ProjectGUID="{6F3C4136-5801-4EBC-AC6E-37DF6FAB150A}"
RootNamespace="xpad" RootNamespace="xpad"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="0"
> >
<Platforms> <Platforms>
<Platform <Platform

3
plugins/zerogs/dx/Windows/zerogs_2008.vcproj
View File

@ -70,7 +70,6 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\" AdditionalLibraryDirectories="..\"
ModuleDefinitionFile=".\GSsoftdx.def" ModuleDefinitionFile=".\GSsoftdx.def"
RandomizedBaseAddress="1"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -138,7 +137,6 @@
AdditionalLibraryDirectories="..\" AdditionalLibraryDirectories="..\"
IgnoreDefaultLibraryNames="" IgnoreDefaultLibraryNames=""
ModuleDefinitionFile=".\GSsoftdx.def" ModuleDefinitionFile=".\GSsoftdx.def"
RandomizedBaseAddress="1"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -218,7 +216,6 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\" AdditionalLibraryDirectories="..\"
ModuleDefinitionFile=".\GSsoftdx.def" ModuleDefinitionFile=".\GSsoftdx.def"
RandomizedBaseAddress="1"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool

3
plugins/zerospu2/Windows/ZeroSPU2_2008.vcproj
View File

@ -60,7 +60,6 @@
IgnoreDefaultLibraryNames="" IgnoreDefaultLibraryNames=""
ModuleDefinitionFile="ZeroSPU2.def" ModuleDefinitionFile="ZeroSPU2.def"
SubSystem="2" SubSystem="2"
RandomizedBaseAddress="1"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -128,7 +127,6 @@
IgnoreDefaultLibraryNames="" IgnoreDefaultLibraryNames=""
ModuleDefinitionFile="ZeroSPU2.def" ModuleDefinitionFile="ZeroSPU2.def"
SubSystem="2" SubSystem="2"
RandomizedBaseAddress="1"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -199,7 +197,6 @@
IgnoreDefaultLibraryNames="" IgnoreDefaultLibraryNames=""
ModuleDefinitionFile="ZeroSPU2.def" ModuleDefinitionFile="ZeroSPU2.def"
SubSystem="2" SubSystem="2"
RandomizedBaseAddress="1"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool

4
plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj
View File

@ -528,11 +528,11 @@
</File> </File>
</Filter> </Filter>
<File <File
RelativePath="..\ps2hw.dat" RelativePath=".\ps2hw.dat"
> >
</File> </File>
<File <File
RelativePath=".\ps2hw.dat" RelativePath="..\ps2hw.dat"
> >
</File> </File>
</Files> </Files>