Added missing DebugFast define for several plugin projects and fixed minor bugs

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@10 8ced0084-cf51-0410-be5f-012b33b47a6e

10 files changed, 38 insertions, 24 deletions

diff --git a/Source/Plugins/Plugin_DSP_LLE/Plugin_DSP_LLE.vcproj b/Source/Plugins/Plugin_DSP_LLE/Plugin_DSP_LLE.vcproj
index ecc218f54f..3df83b89e4 100644
--- a/Source/Plugins/Plugin_DSP_LLE/Plugin_DSP_LLE.vcproj
+++ b/Source/Plugins/Plugin_DSP_LLE/Plugin_DSP_LLE.vcproj
@@ -398,7 +398,7 @@
 				FavorSizeOrSpeed="1"

 				OmitFramePointers="true"

 				AdditionalIncludeDirectories="../../Core/Common/Src;../../../Externals/WTL80;../../PluginSpecs"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS;DEBUGFAST"

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="2"

 				AssemblerListingLocation="$(IntDir)\"

@@ -488,7 +488,7 @@
 				FavorSizeOrSpeed="1"

 				OmitFramePointers="true"

 				AdditionalIncludeDirectories="../../Core/Common/Src;../../../Externals/WTL80;../../PluginSpecs"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS;DEBUGFAST"

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="2"

 				AssemblerListingLocation="$(IntDir)\"

diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp b/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp
index b71575d686..3b331abc8a 100644
--- a/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp
+++ b/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp
@@ -66,10 +66,14 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
 	_PluginInfo->Version = 0x0100;

 	_PluginInfo->Type = PLUGIN_TYPE_DSP;

 

+#ifdef DEBUGFAST 

+	sprintf(_PluginInfo->Name, "Dolphin DSP-LLE Plugin (DebugFast)");

+#else

 #ifndef _DEBUG

-	sprintf(_PluginInfo->Name, "Dolphin DSP-LLE Plugin  (DSound)");

+	sprintf(_PluginInfo->Name, "Dolphin DSP-LLE Plugin");

 #else

-	sprintf(_PluginInfo->Name, "Dolphin DSP-LLE Plugin  Debug (DSound)");

+	sprintf(_PluginInfo->Name, "Dolphin DSP-LLE Plugin (Debug)");

+#endif

 #endif

 }

 

diff --git a/Source/Plugins/Plugin_DSP_NULL/Plugin_DSP_NULL.vcproj b/Source/Plugins/Plugin_DSP_NULL/Plugin_DSP_NULL.vcproj
index 958c1ec445..da9242548b 100644
--- a/Source/Plugins/Plugin_DSP_NULL/Plugin_DSP_NULL.vcproj
+++ b/Source/Plugins/Plugin_DSP_NULL/Plugin_DSP_NULL.vcproj
@@ -399,7 +399,7 @@
 				FavorSizeOrSpeed="1"

 				OmitFramePointers="true"

 				AdditionalIncludeDirectories="../../../Externals/WTL80;../../Core/Common/Src;../../PluginSpecs"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS;DEBUGFAST"

 				RuntimeLibrary="0"

 				BufferSecurityCheck="false"

 				FloatingPointModel="2"

@@ -422,7 +422,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="dxguid.lib dsound.lib"

-				OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_NULL.dll"

+				OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_NULLDF.dll"

 				LinkIncremental="1"

 				GenerateManifest="false"

 				GenerateDebugInformation="true"

@@ -490,7 +490,7 @@
 				FavorSizeOrSpeed="1"

 				OmitFramePointers="true"

 				AdditionalIncludeDirectories="../../../Externals/WTL80;../../Core/Common/Src;../../PluginSpecs"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS;DEBUGFAST"

 				RuntimeLibrary="0"

 				BufferSecurityCheck="false"

 				FloatingPointModel="2"

@@ -513,7 +513,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="dxguid.lib dsound.lib"

-				OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_NULL.dll"

+				OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_NULLDF.dll"

 				LinkIncremental="1"

 				GenerateManifest="false"

 				GenerateDebugInformation="true"

diff --git a/Source/Plugins/Plugin_DSP_NULL/Src/main.cpp b/Source/Plugins/Plugin_DSP_NULL/Src/main.cpp
index 7d5f5fb6ac..0b8cac6cbe 100644
--- a/Source/Plugins/Plugin_DSP_NULL/Src/main.cpp
+++ b/Source/Plugins/Plugin_DSP_NULL/Src/main.cpp
@@ -66,10 +66,15 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
 {

 	_PluginInfo->Version = 0x0100;

 	_PluginInfo->Type = PLUGIN_TYPE_DSP;

+

+#ifdef DEBUGFAST 

+	sprintf(_PluginInfo->Name, "Dolphin DSP-NULL Plugin (DebugFast)");

+#else

 #ifndef _DEBUG

 	sprintf(_PluginInfo->Name, "Dolphin DSP-NULL Plugin");

 #else

-	sprintf(_PluginInfo->Name, "Dolphin DSP-NULL Plugin Debug");

+	sprintf(_PluginInfo->Name, "Dolphin DSP-NULL Plugin (Debug)");

+#endif

 #endif

 }

 

diff --git a/Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj b/Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj
index c24937ba9a..8c5491d1a1 100644
--- a/Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj
+++ b/Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj
@@ -449,7 +449,7 @@
 				Optimization="3"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="../../../Externals/WTL80;../../PluginSpecs;../../Core/Common/Src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PAD_SIMPLE_EXPORTS;_CRT_SECURE_NO_DEPRECATE"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PAD_SIMPLE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;DEBUGFAST"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				BufferSecurityCheck="false"

@@ -481,7 +481,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="dxguid.lib dxerr9.lib dinput8.lib xinput.lib"

-				OutputFile="..\..\..\Binary\Win32/plugins\Plugin_PadSimple.dll"

+				OutputFile="..\..\..\Binary\Win32/plugins\Plugin_PadSimpleDF.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateManifest="false"

@@ -551,7 +551,7 @@
 				InlineFunctionExpansion="1"

 				EnableIntrinsicFunctions="true"

 				AdditionalIncludeDirectories="../../../Externals/WTL80;../../PluginSpecs;../../Core/Common/Src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PAD_SIMPLE_EXPORTS;_CRT_SECURE_NO_DEPRECATE"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PAD_SIMPLE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;DEBUGFAST"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				BufferSecurityCheck="false"

@@ -582,7 +582,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="dxguid.lib dxerr9.lib dinput8.lib xinput.lib"

-				OutputFile="..\..\..\Binary\x64\plugins\Plugin_PadSimple.dll"

+				OutputFile="..\..\..\Binary\x64\plugins\Plugin_PadSimpleDF.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateManifest="false"

diff --git a/Source/Plugins/Plugin_PadSimple/Src/main.cpp b/Source/Plugins/Plugin_PadSimple/Src/main.cpp
index e18e62b65c..eb08c9cfce 100644
--- a/Source/Plugins/Plugin_PadSimple/Src/main.cpp
+++ b/Source/Plugins/Plugin_PadSimple/Src/main.cpp
@@ -197,11 +197,16 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
 	_PluginInfo->Version = 0x0100;

 	_PluginInfo->Type = PLUGIN_TYPE_PAD;

 

+#ifdef DEBUGFAST 

+	sprintf(_PluginInfo->Name, "Dolphin KB/X360pad (DebugFast)");

+#else

 #ifndef _DEBUG

-	strcpy(_PluginInfo->Name, "Dolphin KB/X360pad");

+	sprintf(_PluginInfo->Name, "Dolphin KB/X360pad ");

 #else

-	strcpy(_PluginInfo->Name, "Dolphin KB/X360pad (Debug)");

+	sprintf(_PluginInfo->Name, "Dolphin KB/X360pad (Debug)");

+#endif

 #endif

+

 }

 

 

diff --git a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj
index e7bbbb6dae..307f5f18a7 100644
--- a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj
+++ b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj
@@ -470,7 +470,7 @@
 				OmitFramePointers="false"

 				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src"

-				PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;VIDEO_DIRECTX9_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"

+				PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;VIDEO_DIRECTX9_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;DEBUGFAST"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				BufferSecurityCheck="false"

@@ -502,7 +502,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="dsound.lib odbc32.lib odbccp32.lib comctl32.lib d3d9.lib d3dx9.lib winmm.lib"

-				OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_VideoDX9.dll"

+				OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_VideoDX9DF.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateManifest="false"

@@ -576,7 +576,7 @@
 				OmitFramePointers="false"

 				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;VIDEO_DIRECTX9_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;VIDEO_DIRECTX9_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;;DEBUGFAST"

 				StringPooling="true"

 				ExceptionHandling="1"

 				RuntimeLibrary="0"

@@ -610,7 +610,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="dsound.lib odbc32.lib odbccp32.lib comctl32.lib d3d9.lib d3dx9.lib winmm.lib"

-				OutputFile="..\..\..\Binary\x64\Plugins\Plugin_VideoDX9.dll"

+				OutputFile="..\..\..\Binary\x64\Plugins\Plugin_VideoDX9DF.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateManifest="false"

diff --git a/Source/Plugins/Plugin_VideoDX9/Src/BPStructs.cpp b/Source/Plugins/Plugin_VideoDX9/Src/BPStructs.cpp
index 7c8d2dbd65..47b256456d 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/BPStructs.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/BPStructs.cpp
@@ -367,7 +367,7 @@ void BPWritten(int addr, int changes, int newval)
 #ifdef _DEBUG

             const char* pzop[] = {"DISABLE", "ADD", "REPLACE", "?"};

             const char* pztype[] = {"Z8", "Z16", "Z24", "?"};

-            PRIM_LOG("ztex op=%s, type=%s\n", pzop[bpmem.ztex2.op], pztype[bpmem.ztex2.type]);

+            DebugLog("ztex op=%s, type=%s\n", pzop[bpmem.ztex2.op], pztype[bpmem.ztex2.type]);

 #endif

         }

 		break;

diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
index 9d5ed11c7b..17b996adb2 100644
--- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
+++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
@@ -473,7 +473,7 @@
 				OmitFramePointers="true"

 				WholeProgramOptimization="false"

 				AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;./Src;./Src/Windows;../../../Externals;./Src/Windows/libjpeg"

-				PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"

+				PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;DEBUGFAST"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				BufferSecurityCheck="false"

@@ -581,7 +581,7 @@
 				OmitFramePointers="false"

 				WholeProgramOptimization="false"

 				AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;./Src;./Src/Windows;../../../Externals;./Src/Windows/libjpeg"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;DEBUGFAST"

 				StringPooling="true"

 				ExceptionHandling="1"

 				RuntimeLibrary="0"

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index 0d5d660411..1baac68e31 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -64,12 +64,12 @@ void GetDllInfo (PLUGIN_INFO* _PluginInfo)
     _PluginInfo->Version = 0x0100;

     _PluginInfo->Type = PLUGIN_TYPE_VIDEO;

 #ifdef DEBUGFAST 

-    sprintf(_PluginInfo->Name, "Dolphin OGL (DebugFast)" VERSION_STRING);

+    sprintf(_PluginInfo->Name, "Dolphin OGL (DebugFast) " VERSION_STRING);

 #else

 #ifndef _DEBUG

     sprintf(_PluginInfo->Name, "Dolphin OGL " VERSION_STRING);

 #else

-    sprintf(_PluginInfo->Name, "Dolphin OGL Debug " VERSION_STRING);

+    sprintf(_PluginInfo->Name, "Dolphin OGL (Debug) " VERSION_STRING);

 #endif

 #endif

 }