ZeroGS: Fixed up the Win32 builds for OpenGL, and removed some warnings from the DX version. Removed some of the redundant and unused #defines from the project files (__WIN32__, __MSCW32__, etc).

Note: Compiling ZeroGS-OpenGL/Win32 requires the NVIDIA CG Toolkit. Compiling ZeroGS-DX/Win32 requires the DirectX SDK. git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@614 a6443dda-0b58-4228-96e9-037be469359c
2009-01-21 04:17:18 +00:00 · 2009-01-21 04:17:18 +00:00 · c3d54de50d
parent cf156d3c27
commit c3d54de50d
22 changed files with 409 additions and 439 deletions
--- a/pcsx2/Exceptions.h
+++ b/pcsx2/Exceptions.h
@ -204,8 +204,8 @@ namespace Exception
 		std::string plugin_name;		// name of the plugin

 		virtual ~PluginFailure() throw() {}
-		explicit PluginFailure( const std::string& plugin, const std::string& msg = "An error occured in the " ) :
-			RuntimeError( plugin + msg + " Plugin" )
+		explicit PluginFailure( const std::string& plugin, const std::string& msg = "A plugin encountered a critical error." ) :
+			RuntimeError( msg )
 		,	plugin_name( plugin ) {}
 	};

--- a/pcsx2/MTGS.cpp
+++ b/pcsx2/MTGS.cpp
@ -214,7 +214,7 @@ mtgsThreadObject::mtgsThreadObject() :
 	m_wait_InitDone.Wait();

 	if( m_returncode != 0 )	// means the thread failed to init the GS plugin
-		throw Exception::PluginFailure( "GS", "An error occured while opening the " );
+		throw Exception::PluginFailure( "GS", "The GS plugin failed to open/initialize." );
 }

 mtgsThreadObject::~mtgsThreadObject()
--- a/pcsx2/Misc.cpp
+++ b/pcsx2/Misc.cpp
@ -426,7 +426,7 @@ void LoadGSState(const string& file)
 	if (ret != 0)
 	{
 		delete f;
-		throw Exception::PluginFailure( "GS", "Error opening" );
+		throw Exception::PluginFailure( "GS" );
 	}

 	ret = PAD1open((void *)&pDsp);
--- a/pcsx2_suite_2008.sln
+++ b/pcsx2_suite_2008.sln
@ -50,30 +50,30 @@ Global
 		{26511268-2902-4997-8421-ECD7055F9E28}.Release vm|Win32.Build.0 = Release|Win32
 		{26511268-2902-4997-8421-ECD7055F9E28}.Release vtlb|Win32.ActiveCfg = Release|Win32
 		{26511268-2902-4997-8421-ECD7055F9E28}.Release vtlb|Win32.Build.0 = Release|Win32
-		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Debug vm|Win32.ActiveCfg = DebugFast|Win32
-		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Debug vm|Win32.Build.0 = DebugFast|Win32
-		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Debug vtlb|Win32.ActiveCfg = DebugFast|Win32
-		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Debug vtlb|Win32.Build.0 = DebugFast|Win32
-		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Devel vm|Win32.ActiveCfg = Release (dev)|Win32
-		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Devel vm|Win32.Build.0 = Release (dev)|Win32
-		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Devel vtlb|Win32.ActiveCfg = Release (dev)|Win32
-		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Devel vtlb|Win32.Build.0 = Release (dev)|Win32
-		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release vm|Win32.ActiveCfg = Release (nondev) [public]|Win32
-		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release vm|Win32.Build.0 = Release (nondev) [public]|Win32
-		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release vtlb|Win32.ActiveCfg = Release (nondev) [public]|Win32
-		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release vtlb|Win32.Build.0 = Release (nondev) [public]|Win32
-		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Debug vm|Win32.ActiveCfg = Debug|Win32
-		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Debug vm|Win32.Build.0 = Debug|Win32
+		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Debug vm|Win32.ActiveCfg = Debug|Win32
+		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Debug vm|Win32.Build.0 = Debug|Win32
+		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Debug vtlb|Win32.ActiveCfg = Debug|Win32
+		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Debug vtlb|Win32.Build.0 = Debug|Win32
+		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Devel vm|Win32.ActiveCfg = Devel|Win32
+		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Devel vm|Win32.Build.0 = Devel|Win32
+		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Devel vtlb|Win32.ActiveCfg = Devel|Win32
+		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Devel vtlb|Win32.Build.0 = Devel|Win32
+		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release vm|Win32.ActiveCfg = Release|Win32
+		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release vm|Win32.Build.0 = Release|Win32
+		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release vtlb|Win32.ActiveCfg = Release|Win32
+		{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release vtlb|Win32.Build.0 = Release|Win32
+		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Debug vm|Win32.ActiveCfg = Release|Win32
+		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Debug vm|Win32.Build.0 = Release|Win32
 		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Debug vtlb|Win32.ActiveCfg = Debug|Win32
 		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Debug vtlb|Win32.Build.0 = Debug|Win32
-		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Devel vm|Win32.ActiveCfg = Release (dev)|Win32
-		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Devel vm|Win32.Build.0 = Release (dev)|Win32
-		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Devel vtlb|Win32.ActiveCfg = Release (dev)|Win32
-		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Devel vtlb|Win32.Build.0 = Release (dev)|Win32
-		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Release vm|Win32.ActiveCfg = Release (nondev) [public]|Win32
-		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Release vm|Win32.Build.0 = Release (nondev) [public]|Win32
-		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Release vtlb|Win32.ActiveCfg = Release (nondev) [public]|Win32
-		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Release vtlb|Win32.Build.0 = Release (nondev) [public]|Win32
+		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Devel vm|Win32.ActiveCfg = Devel|Win32
+		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Devel vm|Win32.Build.0 = Devel|Win32
+		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Devel vtlb|Win32.ActiveCfg = Devel|Win32
+		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Devel vtlb|Win32.Build.0 = Devel|Win32
+		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Release vm|Win32.ActiveCfg = Release|Win32
+		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Release vm|Win32.Build.0 = Release|Win32
+		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Release vtlb|Win32.ActiveCfg = Release|Win32
+		{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}.Release vtlb|Win32.Build.0 = Release|Win32
 		{7F059854-568D-4E08-9D00-1E78E203E4DC}.Debug vm|Win32.ActiveCfg = Debug|Win32
 		{7F059854-568D-4E08-9D00-1E78E203E4DC}.Debug vm|Win32.Build.0 = Debug|Win32
 		{7F059854-568D-4E08-9D00-1E78E203E4DC}.Debug vtlb|Win32.ActiveCfg = Debug|Win32
--- a/plugins/spu2ghz/SPU2ghz_vs2008.vcproj
+++ b/plugins/spu2ghz/SPU2ghz_vs2008.vcproj
@ -16,7 +16,7 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Release (dev)|Win32"
+			Name="Devel|Win32"
 			OutputDirectory="$(SolutionDir)\bin\plugins\"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
@ -123,7 +123,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
+			Name="DebugStrict|Win32"
 			OutputDirectory="$(SolutionDir)\bin\plugins\"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
@ -221,7 +221,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release (nondev) [public]|Win32"
+			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)\bin\plugins\"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
@ -332,7 +332,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DebugFast|Win32"
+			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)\bin\plugins\"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
@ -441,7 +441,7 @@
 				RelativePath=".\utf8.cpp"
 				>
 				<FileConfiguration
-					Name="Release (dev)|Win32"
+					Name="Devel|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@ -449,7 +449,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release (nondev) [public]|Win32"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@ -476,7 +476,7 @@
 					RelativePath=".\mixer.cpp"
 					>
 					<FileConfiguration
-						Name="Release (dev)|Win32"
+						Name="Devel|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@ -485,6 +485,27 @@
 							CompileAs="0"
 						/>
 					</FileConfiguration>
+					<FileConfiguration
+						Name="DebugStrict|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+							AssemblerOutput="4"
+							BrowseInformation="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+							AssemblerOutput="4"
+							BrowseInformation="1"
+							CompileAs="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@ -495,27 +516,6 @@
 							BrowseInformation="1"
 						/>
 					</FileConfiguration>
-					<FileConfiguration
-						Name="Release (nondev) [public]|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							AssemblerOutput="4"
-							BrowseInformation="1"
-							CompileAs="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugFast|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							AssemblerOutput="4"
-							BrowseInformation="1"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="mixer.h"
@ -529,7 +529,26 @@
 					RelativePath=".\debug.cpp"
 					>
 					<FileConfiguration
-						Name="Release (dev)|Win32"
+						Name="Devel|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+							BrowseInformation="1"
+							CompileAs="0"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="DebugStrict|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+							BrowseInformation="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@ -547,25 +566,6 @@
 							BrowseInformation="1"
 						/>
 					</FileConfiguration>
-					<FileConfiguration
-						Name="Release (nondev) [public]|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							BrowseInformation="1"
-							CompileAs="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugFast|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							BrowseInformation="1"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="debug.h"
@ -575,7 +575,7 @@
 					RelativePath=".\spu2replay.cpp"
 					>
 					<FileConfiguration
-						Name="Release (dev)|Win32"
+						Name="Devel|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@ -583,7 +583,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release (nondev) [public]|Win32"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@ -599,7 +599,7 @@
 					RelativePath=".\wavedump_wav.cpp"
 					>
 					<FileConfiguration
-						Name="Release (dev)|Win32"
+						Name="Devel|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@ -607,7 +607,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release (nondev) [public]|Win32"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@ -623,7 +623,7 @@
 					RelativePath=".\sndout.cpp"
 					>
 					<FileConfiguration
-						Name="Release (dev)|Win32"
+						Name="Devel|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@ -633,7 +633,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="DebugStrict|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@ -642,7 +642,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release (nondev) [public]|Win32"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@ -653,7 +653,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="DebugFast|Win32"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@ -673,7 +673,26 @@
 						RelativePath=".\waveout.cpp"
 						>
 						<FileConfiguration
-							Name="Release (dev)|Win32"
+							Name="Devel|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								UsePrecompiledHeader="0"
+								BrowseInformation="1"
+								CompileAs="0"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="DebugStrict|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								UsePrecompiledHeader="0"
+								BrowseInformation="1"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@ -691,25 +710,6 @@
 								BrowseInformation="1"
 							/>
 						</FileConfiguration>
-						<FileConfiguration
-							Name="Release (nondev) [public]|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								UsePrecompiledHeader="0"
-								BrowseInformation="1"
-								CompileAs="0"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="DebugFast|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								UsePrecompiledHeader="0"
-								BrowseInformation="1"
-							/>
-						</FileConfiguration>
 					</File>
 				</Filter>
 				<Filter
@ -804,7 +804,27 @@
 					RelativePath=".\dma.cpp"
 					>
 					<FileConfiguration
-						Name="Release (dev)|Win32"
+						Name="Devel|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+							AssemblerOutput="4"
+							BrowseInformation="1"
+							CompileAs="0"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="DebugStrict|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+							BrowseInformation="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@ -823,26 +843,6 @@
 							BrowseInformation="1"
 						/>
 					</FileConfiguration>
-					<FileConfiguration
-						Name="Release (nondev) [public]|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							AssemblerOutput="4"
-							BrowseInformation="1"
-							CompileAs="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugFast|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							BrowseInformation="1"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="dma.h"
@ -884,7 +884,7 @@
 					RelativePath=".\spu2.cpp"
 					>
 					<FileConfiguration
-						Name="Release (dev)|Win32"
+						Name="Devel|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@ -894,7 +894,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="DebugStrict|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@ -903,7 +903,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release (nondev) [public]|Win32"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@ -914,7 +914,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="DebugFast|Win32"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@ -935,7 +935,26 @@
 					RelativePath=".\config.cpp"
 					>
 					<FileConfiguration
-						Name="Release (dev)|Win32"
+						Name="Devel|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+							BrowseInformation="1"
+							CompileAs="0"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="DebugStrict|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+							BrowseInformation="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@ -953,25 +972,6 @@
 							BrowseInformation="1"
 						/>
 					</FileConfiguration>
-					<FileConfiguration
-						Name="Release (nondev) [public]|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							BrowseInformation="1"
-							CompileAs="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugFast|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							BrowseInformation="1"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="config.h"
--- a/plugins/spu2ghz/spu2.h
+++ b/plugins/spu2ghz/spu2.h
@ -33,7 +33,6 @@
 #include "time.h"

 //SPU2 plugin defines
-//#define __MSCW32__
 //#define SPU2defs		// not using the PCSX2 defs (see below)
 #include "PS2Edefs.h"

--- a/plugins/zerogs/dx/GS.h
+++ b/plugins/zerogs/dx/GS.h
@ -28,7 +28,7 @@ extern "C" {
 #include "PS2Edefs.h"
 }

-#ifdef __WIN32__
+#ifdef _WIN32

 #include <windows.h>
 #include <windowsx.h>
@ -74,7 +74,7 @@ struct Vector_16F
 //#define ZEROGS_CACHEDCLEAR // much better performance
 //#define RELEASE_TO_PUBLIC

-#if !defined(_RELEASE)
+#if defined(ZEROGS_DEVBUILD)
 #define GS_LOG __Log
 #else
 #define GS_LOG 0&&
--- a/plugins/zerogs/dx/GSmain.cpp
+++ b/plugins/zerogs/dx/GSmain.cpp
@ -42,7 +42,7 @@ using namespace std;
 #include "targets.h"
 #include "zerogsshaders/zerogsshaders.h"

-#ifdef __MSCW32__
+#ifdef _MSC_VER
 #pragma warning(disable:4244)
 #endif

@ -130,7 +130,10 @@ void SysMessage(char *fmt, ...) {
 void __Log(const char *fmt, ...) {
 	va_list list;

-	if (!conf.log) return;
+	// gsLog can be null if the config dialog is used prior to Pcsx2 an emulation session.
+	// (GSinit won't have been called then)
+
+	if (gsLog == NULL || !conf.log) return;

 	va_start(list, fmt);
 	vfprintf(gsLog, fmt, list);
@ -142,8 +145,12 @@ void __LogToConsole(const char *fmt, ...) {

 	printf("ZeroGS: ");

+	// gsLog can be null if the config dialog is used prior to Pcsx2 an emulation session.
+	// (GSinit won't have been called then)
+
 	va_start(list, fmt);
-	vfprintf(gsLog, fmt, list);
+	if( gsLog != NULL )
+		vfprintf(gsLog, fmt, list);
 	vprintf(fmt, list);
 	va_end(list);
 }
--- a/plugins/zerogs/dx/Regs.cpp
+++ b/plugins/zerogs/dx/Regs.cpp
@ -33,7 +33,7 @@
 #include "zerogs.h"
 #include "targets.h"

-#ifdef __MSCW32__
+#ifdef _MSC_VER
 #pragma warning(disable:4244)
 #endif

--- a/plugins/zerogs/dx/Win32/GSsoftdx.def
+++ b/plugins/zerogs/dx/Win32/GSsoftdx.def
@ -1,6 +1,6 @@
 ; Declares the module parameters for the DLL.

-LIBRARY      "ZeroGS"
+;LIBRARY      "ZeroGS"

 EXPORTS
    ; Explicit exports can go here
--- a/plugins/zerogs/dx/Win32/zerogs_2008.vcproj
+++ b/plugins/zerogs/dx/Win32/zerogs_2008.vcproj
@ -16,7 +16,7 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Release (dev)|Win32"
+			Name="Devel|Win32"
 			OutputDirectory="$(SolutionDir)\bin\plugins\"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
@ -56,17 +56,14 @@
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories=".\;..\;..\x86\;..\..\ZeroGSShaders\;&quot;$(SolutionDir)\common&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__MSCW32__;__i386__;_RELEASE;ZEROGS_SSE2;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;__i386__;ZEROGS_DEVBUILD;ZEROGS_SSE2;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
 				PrecompiledHeaderFile=".\Release/GSsoftdx.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="0"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@ -145,16 +142,12 @@
 				Optimization="0"
 				EnableFiberSafeOptimizations="true"
 				AdditionalIncludeDirectories=".\;..\;..\x86\;..\..\ZeroGSShaders\;&quot;$(SolutionDir)\common&quot;"
-				PreprocessorDefinitions="D3D_DEBUG_INFO;_USRDLL;__WIN32__;__MSCW32__;_DEBUG;__i386__;ZEROGS_SSE2;_CRT_SECURE_NO_WARNINGS"
-				IgnoreStandardIncludePath="false"
+				PreprocessorDefinitions="D3D_DEBUG_INFO;_USRDLL;_DEBUG;__i386__;ZEROGS_DEVBUILD;ZEROGS_SSE2;_CRT_SECURE_NO_WARNINGS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/vc70.pdb"
 				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -200,7 +193,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release (nondev) [public]|Win32"
+			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)\bin\plugins\"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
@ -240,16 +233,14 @@
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories=".\;..\;..\x86\;..\..\ZeroGSShaders\;&quot;$(SolutionDir)\common&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__MSCW32__;__i386__;_RELEASE;RELEASE_TO_PUBLIC;ZEROGS_SSE2;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;__i386__;RELEASE_TO_PUBLIC;ZEROGS_SSE2;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
 				PrecompiledHeaderFile=""
-				AssemblerListingLocation=".\Release (to Public)/"
-				ObjectFile=".\Release (to Public)/"
-				ProgramDataBaseFileName=".\Release (to Public)/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@ -345,7 +336,7 @@
 				RelativePath="..\x86-32.asm"
 				>
 				<FileConfiguration
-					Name="Release (dev)|Win32"
+					Name="Devel|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@ -363,7 +354,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release (nondev) [public]|Win32"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
--- a/plugins/zerogs/opengl/GS.h
+++ b/plugins/zerogs/opengl/GS.h
@ -19,16 +19,6 @@
 #ifndef __GS_H__
 #define __GS_H__

-#include <stdio.h>
-#include <malloc.h>
-#include <assert.h>
-
-// need C definitions
-extern "C" {
-#define GSdefs
-#include "PS2Edefs.h"
-}
-
 #ifdef _WIN32

 #include <windows.h>
@ -36,10 +26,6 @@ extern "C" {

 extern HWND GShwnd;

-extern "C" u32   CALLBACK PS2EgetLibType(void);
-extern "C" u32   CALLBACK PS2EgetLibVersion2(u32 type);
-extern "C" char* CALLBACK PS2EgetLibName(void);
-
 #else // linux basic definitions

 #include <GL/glew.h>
@ -53,15 +39,31 @@ extern "C" char* CALLBACK PS2EgetLibName(void);
 #include <sys/stat.h>
 #include <sys/types.h>

+#endif
+
+#include <stdio.h>
+#include <malloc.h>
+#include <assert.h>
+
+// need C definitions
+extern "C" {
+#define GSdefs
+#include "PS2Edefs.h"
+
+extern "C" u32   CALLBACK PS2EgetLibType(void);
+extern "C" u32   CALLBACK PS2EgetLibVersion2(u32 type);
+extern "C" char* CALLBACK PS2EgetLibName(void);
+}
+
+#include "zerogsmath.h"
+
+#ifndef _WIN32
 #include <assert.h>
-#include <math.h>

 #include <vector>
 #include <string>
 using namespace std;

-#include "zerogsmath.h"
-
 extern u32 THR_KeyEvent; // value for passing out key events beetwen threads
 extern bool THR_bShift;

@ -145,8 +147,10 @@ struct Vector_16F
 // The only code that uses it is commented out!
 //#define ZEROGS_CACHEDCLEAR // much better performance
 //#define RELEASE_TO_PUBLIC
+// fixme - We should use ZEROGS_DEVBUILD to determine devel/debug builds from "public release" builds.
+//  Means a lot of search-and-replace though. (air)

-#if !defined(_RELEASE)
+#ifdef ZEROGS_DEVBUILD
 #define GS_LOG __Log
 #else
 #define GS_LOG 0&&
--- a/plugins/zerogs/opengl/GSmain.cpp
+++ b/plugins/zerogs/opengl/GSmain.cpp
@ -40,7 +40,7 @@ using namespace std;
 #include "targets.h"
 #include "ZeroGSShaders/zerogsshaders.h"

-#ifdef __MSCW32__
+#ifdef _MSC_VER
 #pragma warning(disable:4244)
 #endif

@ -69,11 +69,11 @@ unsigned char zgsbuild	= VER;
 unsigned char zgsminor = 7;

 #ifdef _DEBUG
-char *libraryName	 = "ZeroGS OpenGL (Debug) ";
+char *libraryName	 = "ZeroGS-Pg OpenGL (Debug) ";
 #elif defined(RELEASE_TO_PUBLIC)
-char *libraryName	 = "ZeroGS KOSMOS OpenGL ";
+char *libraryName	 = "ZeroGS Playground OpenGL ";
 #else
-char *libraryName	 = "ZeroGS OpenGL (Dev) ";
+char *libraryName	 = "ZeroGS-Pg OpenGL (Dev) ";
 #endif

 static const char* s_aa[3] = { "AA none |", "AA 2x |", "AA 4x |" };
@ -131,7 +131,10 @@ bool THR_bShift = false;
 void __Log(const char *fmt, ...) {
 	va_list list;

-	if (!conf.log) return;
+	// gsLog can be null if the config dialog is used prior to Pcsx2 an emulation session.
+	// (GSinit won't have been called then)
+
+	if (gsLog == NULL || !conf.log) return;

 	va_start(list, fmt);
 	vfprintf(gsLog, fmt, list);
@ -142,11 +145,13 @@ void __LogToConsole(const char *fmt, ...) {
 	va_list list;

 	va_start(list, fmt);
-	fprintf(gsLog, "ZeroGS: ");
-	vfprintf(gsLog, fmt, list);
-	va_end(list);

-	va_start(list, fmt);
+	// gsLog can be null if the config dialog is used prior to Pcsx2 an emulation session.
+	// (GSinit won't have been called then)
+
+	if( gsLog != NULL )
+		vfprintf(gsLog, fmt, list);
+
 	printf("ZeroGS: ");
 	vprintf(fmt, list);
 	va_end(list);
--- a/plugins/zerogs/opengl/Regs.cpp
+++ b/plugins/zerogs/opengl/Regs.cpp
@ -31,7 +31,7 @@
 const u32 g_primmult[8] = { 1, 2, 2, 3, 3, 3, 2, 0xff };
 const u32 g_primsub[8] = { 1, 2, 1, 3, 1, 1, 2, 0 };

-#ifdef __MSCW32__
+#ifdef _MSC_VER
 #pragma warning(disable:4244)
 #endif

--- a/plugins/zerogs/opengl/Win32/zerogs.def
+++ b/plugins/zerogs/opengl/Win32/zerogs.def
@ -1,7 +1,7 @@
 ; Declares the module parameters for the DLL.

-LIBRARY      "ZeroGS"
-DESCRIPTION  'ZeroGS dll'
+;LIBRARY      "ZeroGS"
+;DESCRIPTION  'ZeroGS dll'

 EXPORTS
    ; Explicit exports can go here
--- a/plugins/zerogs/opengl/Win32/zerogsogl_2005.sln
+++ b/plugins/zerogs/opengl/Win32/zerogsogl_2005.sln
@ -1,23 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zerogsogl_2005", "zerogsogl_2005.vcproj", "{2D4E85B2-F47F-4D65-B091-701E5C031DAC}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release (to Public)|Win32 = Release (to Public)|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2D4E85B2-F47F-4D65-B091-701E5C031DAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2D4E85B2-F47F-4D65-B091-701E5C031DAC}.Debug|Win32.Build.0 = Debug|Win32
-		{2D4E85B2-F47F-4D65-B091-701E5C031DAC}.Release (to Public)|Win32.ActiveCfg = Release (to Public)|Win32
-		{2D4E85B2-F47F-4D65-B091-701E5C031DAC}.Release (to Public)|Win32.Build.0 = Release (to Public)|Win32
-		{2D4E85B2-F47F-4D65-B091-701E5C031DAC}.Release|Win32.ActiveCfg = Release|Win32
-		{2D4E85B2-F47F-4D65-B091-701E5C031DAC}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/plugins/zerogs/opengl/Win32/zerogsogl_2008.vcproj
+++ b/plugins/zerogs/opengl/Win32/zerogsogl_2008.vcproj
@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="zerogsogl_2005"
+	Name="ZeroGS-OpenGL-Pg"
 	ProjectGUID="{2D4E85B2-F47F-4D65-B091-701E5C031DAC}"
 	RootNamespace="ZeroGS"
 	TargetFrameworkVersion="131072"
@ -16,196 +16,10 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/GSsoftdx.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories=".\;..\;..\x86\;..\..\ZeroGSShaders\;zlib\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__MSCW32__;__i386__;_RELEASE;_CRT_SECURE_NO_DEPRECATE;ZEROGS_SSE2"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				PrecompiledHeaderFile=".\Release/GSsoftdx.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib Vfw32.lib cg.lib cgGL.lib libjpeg.lib opengl32.lib"
-				OutputFile=".\Release/$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\;.\Cg"
-				ModuleDefinitionFile=".\zerogs.def"
-				GenerateDebugInformation="false"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\Release/GSsoftdx.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				EnableFiberSafeOptimizations="true"
-				AdditionalIncludeDirectories=".\;..\;..\x86\;..\..\ZeroGSShaders\;zlib\"
-				PreprocessorDefinitions="D3D_DEBUG_INFO;_USRDLL;__WIN32__;__MSCW32__;_DEBUG,__i386__;_CRT_SECURE_NO_DEPRECATE;ZEROGS_SSE2"
-				IgnoreStandardIncludePath="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/vc70.pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib Vfw32.lib cg.lib cgGL.lib libjpeg.lib opengl32.lib"
-				OutputFile=".\Debug/$(ProjectName)d.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\;.\Cg"
-				IgnoreDefaultLibraryNames=""
-				ModuleDefinitionFile=".\zerogs.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (to Public)|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			Name="Devel|Win32"
+			OutputDirectory="$(SolutionDir)\bin\plugins\"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@ -239,18 +53,15 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".\;..\;..\x86\;..\..\ZeroGSShaders\;zlib\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__MSCW32__;__i386__;_RELEASE;_CRT_SECURE_NO_DEPRECATE;ZEROGS_SSE2;RELEASE_TO_PUBLIC"
+				AdditionalIncludeDirectories=".\;..\;..\x86\;..\..\ZeroGSShaders\;&quot;$(SolutionDir)\common&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;__i386__;ZEROGS_DEVBUILD;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation=".\Release (to Public)/"
-				ObjectFile=".\Release (to Public)/"
-				ProgramDataBaseFileName=".\Release (to Public)/"
+				PrecompiledHeaderFile=".\Release/GSsoftdx.pch"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				CompileAs="0"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -266,12 +77,185 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib Vfw32.lib cg.lib cgGL.lib libjpeg.lib opengl32.lib"
-				OutputFile=".\Release (to Public)/$(ProjectName)r.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\;.\Cg"
+				OutputFile="$(OutDir)\$(ProjectName)-dev.dll"
+				AdditionalLibraryDirectories="..\"
 				ModuleDefinitionFile=".\zerogs.def"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
+				LinkTimeCodeGeneration="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary=".\Release/GSsoftdx.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)\bin\plugins\"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\;..\;..\x86\;..\..\ZeroGSShaders\;&quot;$(SolutionDir)\common&quot;"
+				PreprocessorDefinitions="_USRDLL;ZEROGS_DEVBUILD;_DEBUG;__i386__;_CRT_SECURE_NO_DEPRECATE"
+				IgnoreStandardIncludePath="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				EnableFunctionLevelLinking="true"
+				RuntimeTypeInfo="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib Vfw32.lib cg.lib cgGL.lib libjpeg.lib opengl32.lib"
+				OutputFile="$(OutDir)\$(ProjectName)-dbg.dll"
+				AdditionalLibraryDirectories="..\"
+				IgnoreDefaultLibraryNames=""
+				ModuleDefinitionFile=".\zerogs.def"
+				GenerateDebugInformation="true"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)\bin\plugins\"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			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"
+				TypeLibraryName=".\Release/GSsoftdx.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				WholeProgramOptimization="true"
+				AdditionalIncludeDirectories=".\;..\;..\x86\;..\..\ZeroGSShaders\;&quot;$(SolutionDir)\common&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;__i386__;_CRT_SECURE_NO_DEPRECATE;ZEROGS_SSE2;RELEASE_TO_PUBLIC"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				PrecompiledHeaderFile=""
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib Vfw32.lib cg.lib cgGL.lib libjpeg.lib opengl32.lib"
+				OutputFile="$(OutDir)\$(ProjectName).dll"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\"
+				ModuleDefinitionFile=".\zerogs.def"
+				GenerateDebugInformation="true"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary=""
@ -352,7 +336,7 @@
 				RelativePath="..\x86-32.asm"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Devel|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@ -370,7 +354,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release (to Public)|Win32"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
--- a/plugins/zerogs/opengl/zerogs.cpp
+++ b/plugins/zerogs/opengl/zerogs.cpp
@ -4966,7 +4966,7 @@ void ZeroGS::SetTexVariablesInt(int context, int bilinear, const tex0Info& tex0,
 					/* default: 16bit surface, so returned alpha is ok */ \
 			} \
 		break; \
-		\	
+		\
 		case 2: \
 			bNeedBlendFactorInAlpha = 1; /* should disable alpha channel writing */ \
 			vAlphaBlendColor.y = 0; \
--- a/plugins/zerogs/opengl/zerogsmath.h
+++ b/plugins/zerogs/opengl/zerogsmath.h
@ -6,6 +6,7 @@
 #endif

 #include <string.h>
+#include <math.h>

 #ifndef PI
 #define PI ((dReal)3.141592654)
--- a/plugins/zerogs/opengl/zpipe.cpp
+++ b/plugins/zerogs/opengl/zpipe.cpp
@ -8,7 +8,7 @@
 #include <assert.h>

 //#define ZLIB_WINAPI
-#include "zlib.h"
+#include "zlib/zlib.h"

 int def(char *src, char *dst, int bytes_to_compress, int *bytes_after_compressed) ;
 int inf(char *src, char *dst, int bytes_to_decompress, int maximum_after_decompress) ;
--- a/plugins/zerospu2/Win32.cpp
+++ b/plugins/zerospu2/Win32.cpp
@ -209,7 +209,7 @@ void SysMessage(char *fmt, ...) {
 	char tmp[512];

 	va_start(list,fmt);
-	vsprintf(tmp,fmt,list);
+	vsprintf_s(tmp,fmt,list);
 	va_end(list);
 	MessageBox(0, tmp, "SPU2NULL Msg", 0);
 }
@ -302,10 +302,11 @@ void SaveConfig()
 	szTemp = strrchr(szIniFile, '\\');

 	if(!szTemp) return;
-	strcpy(szTemp, "\\inis\\zerospu2.ini");
-	sprintf(szValue,"%u",Conf1->Log);
+	szTemp[0] = 0;		// this modifies szInitFile also.
+	strcat_s(szIniFile, "\\inis\\zerospu2.ini");
+	sprintf_s(szValue,"%u",Conf1->Log);
    WritePrivateProfileString("Interface", "Logging",szValue,szIniFile);
-    sprintf(szValue,"%u",Conf1->options);
+    sprintf_s(szValue,"%u",Conf1->options);
    WritePrivateProfileString("Interface", "Options",szValue,szIniFile);

 }
@ -321,8 +322,9 @@ void LoadConfig()
 	szTemp = strrchr(szIniFile, '\\');

 	if(!szTemp) return ;
-	strcpy(szTemp, "\\inis\\zerospu2.ini");
-    fp=fopen("inis\\zerospu2.ini","rt");//check if usbnull.ini really exists
+	szTemp[0] = 0;
+	strcpy_s(szIniFile, "\\inis\\zerospu2.ini");
+    fopen_s(&fp, "inis\\zerospu2.ini","rt");//check if usbnull.ini really exists
 	if (!fp)
 	{
 		CreateDirectory("inis",NULL); 
--- a/plugins/zerospu2/ZeroSPU2_2008.vcproj
+++ b/plugins/zerospu2/ZeroSPU2_2008.vcproj
@ -50,7 +50,7 @@
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"