git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@62026 e17a0e51-4ae3-4d35-97c3-1a29b211df97

8 files changed, 22 insertions, 16 deletions

diff --git a/win32/plugins/PadSSSPSX/PadSSSPSX.dsp b/win32/plugins/PadSSSPSX/PadSSSPSX.dsp
index b550a060..e816d306 100644
--- a/win32/plugins/PadSSSPSX/PadSSSPSX.dsp
+++ b/win32/plugins/PadSSSPSX/PadSSSPSX.dsp
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SSSPSXPAD_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SSSPSXPAD_EXPORTS" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SSSPSXPAD_EXPORTS" /YX /FD /GZ /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x804 /d "_DEBUG"

@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dinput8.lib dxguid.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dinput8.lib dxguid.lib /nologo /dll /incremental:no /debug /machine:I386 /pdbtype:sept

 

 !ENDIF 

 

diff --git a/win32/plugins/PadSSSPSX/PadSSSPSX.vcproj b/win32/plugins/PadSSSPSX/PadSSSPSX.vcproj
index c473c6ae..96db2cc1 100644
--- a/win32/plugins/PadSSSPSX/PadSSSPSX.vcproj
+++ b/win32/plugins/PadSSSPSX/PadSSSPSX.vcproj
@@ -4,6 +4,7 @@
 	Version="9.00"

 	Name="SSSPSXpad"

 	ProjectGUID="{0639CDF3-8C1F-47F4-A760-F5568194A083}"

+	RootNamespace="SSSPSXpad"

 	TargetFrameworkVersion="0"

 	>

 	<Platforms>

@@ -58,7 +59,7 @@
 				ProgramDataBaseFileName=".\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

+				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -75,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib dinput8.lib dxguid.lib"

 				OutputFile=".\Debug/PadSSSPSX.dll"

-				LinkIncremental="2"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ModuleDefinitionFile=".\PadSSSPSX.def"

 				GenerateDebugInformation="true"

diff --git a/win32/plugins/dfsound/DFSound.dsp b/win32/plugins/dfsound/DFSound.dsp
index 34bc1fef..e83dadd5 100644
--- a/win32/plugins/dfsound/DFSound.dsp
+++ b/win32/plugins/dfsound/DFSound.dsp
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ".\\" /I ".\winsrc" /I "..\..\..\plugins\dfsound" /I "..\..\glue" /I "..\..\..\libpcsxcore" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ".\\" /I ".\winsrc" /I "..\..\..\plugins\dfsound" /I "..\..\glue" /I "..\..\..\libpcsxcore" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x407 /d "_DEBUG"

@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 dsound.lib winmm.lib user32.lib gdi32.lib advapi32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 dsound.lib winmm.lib user32.lib gdi32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /pdbtype:sept

 

 !ENDIF 

 

diff --git a/win32/plugins/dfsound/DFSound.vcproj b/win32/plugins/dfsound/DFSound.vcproj
index 686ff4f4..97d677d5 100644
--- a/win32/plugins/dfsound/DFSound.vcproj
+++ b/win32/plugins/dfsound/DFSound.vcproj
@@ -4,6 +4,7 @@
 	Version="9.00"

 	Name="DFSound"

 	ProjectGUID="{DB25BF63-9B9E-4A40-A45E-BBBA49AD6F22}"

+	RootNamespace="DFSound"

 	TargetFrameworkVersion="0"

 	>

 	<Platforms>

@@ -154,7 +155,7 @@
 				ProgramDataBaseFileName=".\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

+				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -171,7 +172,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="dsound.lib winmm.lib"

 				OutputFile=".\Debug/DFSound.dll"

-				LinkIncremental="2"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ModuleDefinitionFile=".\DFSound.def"

 				GenerateDebugInformation="true"

diff --git a/win32/plugins/dfxvideo/DFXVideo.dsp b/win32/plugins/dfxvideo/DFXVideo.dsp
index ee0a52b2..717f8d1a 100644
--- a/win32/plugins/dfxvideo/DFXVideo.dsp
+++ b/win32/plugins/dfxvideo/DFXVideo.dsp
@@ -73,7 +73,7 @@ PostBuild_Cmds=rem copy release\DFXVideo.dll  d:\emus\epsxe\plugins	rem copy rel
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ".\\" /I ".\winsrc" /I "..\..\glue" /I "..\..\..\plugins\dfxvideo" /I "..\..\..\libpcsxcore" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ".\\" /I ".\winsrc" /I "..\..\glue" /I "..\..\..\plugins\dfxvideo" /I "..\..\..\libpcsxcore" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x407 /d "_DEBUG"

@@ -83,7 +83,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 user32.lib gdi32.lib winmm.lib advapi32.lib vfw32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 user32.lib gdi32.lib winmm.lib advapi32.lib vfw32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /pdbtype:sept

 

 !ENDIF 

 

diff --git a/win32/plugins/dfxvideo/DFXVideo.vcproj b/win32/plugins/dfxvideo/DFXVideo.vcproj
index f67eaf2b..1f9182ab 100644
--- a/win32/plugins/dfxvideo/DFXVideo.vcproj
+++ b/win32/plugins/dfxvideo/DFXVideo.vcproj
@@ -4,6 +4,7 @@
 	Version="9.00"

 	Name="DFXVideo"

 	ProjectGUID="{30F06328-DD64-4030-AF7A-19FBC74CF298}"

+	RootNamespace="DFXVideo"

 	TargetFrameworkVersion="0"

 	>

 	<Platforms>

@@ -155,7 +156,7 @@
 				ProgramDataBaseFileName=".\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

+				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -172,7 +173,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="winmm.lib vfw32.lib"

 				OutputFile=".\Debug/DFXVideo.dll"

-				LinkIncremental="2"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ModuleDefinitionFile=".\DFXVideo.def"

 				GenerateDebugInformation="true"

diff --git a/win32/plugins/peopsxgl/gpuPeopsOpenGL.dsp b/win32/plugins/peopsxgl/gpuPeopsOpenGL.dsp
index 3c041f24..4862dad7 100644
--- a/win32/plugins/peopsxgl/gpuPeopsOpenGL.dsp
+++ b/win32/plugins/peopsxgl/gpuPeopsOpenGL.dsp
@@ -70,9 +70,10 @@ PostBuild_Cmds=rem copy release\*.dll d:\emus\epsxe\plugins
 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir "Debug"

 # PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ".\\" /I ".\winsrc" /I "..\..\glue" /I "..\..\..\plugins\peopsxgl" /I "..\..\..\libpcsxcore" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ".\\" /I ".\winsrc" /I "..\..\glue" /I "..\..\..\plugins\peopsxgl" /I "..\..\..\libpcsxcore" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x407 /d "_DEBUG"

@@ -82,7 +83,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  opengl32.lib winmm.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /pdbtype:sept

 

 !ENDIF 

 

diff --git a/win32/plugins/peopsxgl/gpuPeopsOpenGL.vcproj b/win32/plugins/peopsxgl/gpuPeopsOpenGL.vcproj
index b097e2a9..0184e090 100644
--- a/win32/plugins/peopsxgl/gpuPeopsOpenGL.vcproj
+++ b/win32/plugins/peopsxgl/gpuPeopsOpenGL.vcproj
@@ -4,6 +4,7 @@
 	Version="9.00"

 	Name="gpuPeopsOpenGL"

 	ProjectGUID="{726BDE88-F2AD-4666-A4BC-5858F973976E}"

+	RootNamespace="gpuPeopsOpenGL"

 	TargetFrameworkVersion="0"

 	>

 	<Platforms>

@@ -58,7 +59,7 @@
 				ProgramDataBaseFileName=".\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

+				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -73,8 +74,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

+				AdditionalDependencies="opengl32.lib winmm.lib"

 				OutputFile=".\Debug/gpuPeopsOpenGL.dll"

-				LinkIncremental="2"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ModuleDefinitionFile=".\gpuPeopsOpenGL.def"

 				GenerateDebugInformation="true"