Misc : build fix for debug x64, assorted cleanup.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4127 8ced0084-cf51-0410-be5f-012b33b47a6e
Ben754 · Aug 31, 2009 · 0b5c993 · 0b5c993
1 parent fdf94d7
commit 0b5c993
Show file tree

Hide file tree

Showing 10 changed files with 157 additions and 138 deletions.
diff --git a/Externals/wxWidgets/build/msw/wx_adv.vcproj b/Externals/wxWidgets/build/msw/wx_adv.vcproj
@@ -153,7 +153,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\wxmsw28ud_$(ProjectName).lib"
+				OutputFile="$(OutDir)\wxmsw28ud_adv.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -309,7 +309,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\wxmsw28u_$(ProjectName).lib"
+				OutputFile="$(OutDir)\wxmsw28u_adv.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1473,6 +1473,10 @@
 		<Filter
 			Name="Setup Headers"
 			>
+			<File
+				RelativePath="..\..\include\wx\univ\setup.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\setup.h"
 				>
@@ -1517,10 +1521,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\setup.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="MSW Headers"

diff --git a/Source/Core/Core/Src/HW/PixelEngine.cpp b/Source/Core/Core/Src/HW/PixelEngine.cpp
@@ -229,11 +229,11 @@ void Read16(u16& _uReturnValue, const u32 _iAddress)
 	case PE_PERF_4H:
 	case PE_PERF_5L:
 	case PE_PERF_5H:
-		WARN_LOG(PIXELENGINE, "(r16) perf counter @ %08x", _iAddress);
+		INFO_LOG(PIXELENGINE, "(r16) perf counter @ %08x", _iAddress);
 		break;
 
 	default:
-		WARN_LOG(PIXELENGINE, "(r16) unknown @ %08x", _iAddress);
+		INFO_LOG(PIXELENGINE, "(r16) unknown @ %08x", _iAddress);
 		_uReturnValue = 1;
 		break;
 	}

diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp
@@ -263,7 +263,7 @@ bool CNANDContentLoader::CreateFromDirectory(const std::string& _rPath)
 		} 
 		else 
 		{
-			PanicAlert("NANDContentLoader: error opening %s", szFilename);
+			ERROR_LOG(DISCIO, "NANDContentLoader: error opening %s", szFilename);
 		}
 	}
 

diff --git a/Source/Core/DiscIO/Src/Volume.h b/Source/Core/DiscIO/Src/Volume.h
@@ -27,42 +27,35 @@ namespace DiscIO
 {
 class IVolume
 {
-	public:
-
-		IVolume()
-		{}
-
-
-		virtual ~IVolume()
-		{}
-
-
-		virtual bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const = 0;
-		virtual bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const = 0;
-		virtual bool GetTitleID(u8*) const { return false; }
-		virtual std::string GetUniqueID() const = 0;
-		virtual std::string GetMakerID() const = 0;
-		virtual std::string GetName() const = 0;
-		virtual u32 GetFSTSize() const = 0;
-		virtual std::string GetApploaderDate() const = 0;
-
-
-		enum ECountry
-		{
-			COUNTRY_EUROPE = 0,
-			COUNTRY_FRANCE = 1,
-			COUNTRY_USA = 2,
-			COUNTRY_JAPAN,
-			COUNTRY_KOREA,
-			COUNTRY_ITALY,
-			COUNTRY_TAIWAN,
-			COUNTRY_SDK,
-			COUNTRY_UNKNOWN,
-			NUMBER_OF_COUNTRIES
-		};
-
-		virtual ECountry GetCountry() const = 0;
-		virtual u64 GetSize() const = 0;
+public:
+	IVolume() {}
+	virtual ~IVolume() {}
+
+	virtual bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const = 0;
+	virtual bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const = 0;
+	virtual bool GetTitleID(u8*) const { return false; }
+	virtual std::string GetUniqueID() const = 0;
+	virtual std::string GetMakerID() const = 0;
+	virtual std::string GetName() const = 0;
+	virtual u32 GetFSTSize() const = 0;
+	virtual std::string GetApploaderDate() const = 0;
+
+	enum ECountry
+	{
+		COUNTRY_EUROPE = 0,
+		COUNTRY_FRANCE = 1,
+		COUNTRY_USA = 2,
+		COUNTRY_JAPAN,
+		COUNTRY_KOREA,
+		COUNTRY_ITALY,
+		COUNTRY_TAIWAN,
+		COUNTRY_SDK,
+		COUNTRY_UNKNOWN,
+		NUMBER_OF_COUNTRIES
+	};
+
+	virtual ECountry GetCountry() const = 0;
+	virtual u64 GetSize() const = 0;
 };
 
 // Generic Switch function for all volumes

diff --git a/Source/Core/DiscIO/Src/VolumeDirectory.h b/Source/Core/DiscIO/Src/VolumeDirectory.h
@@ -15,7 +15,8 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#pragma once
+#ifndef _VOLUME_DIRECTORY
+#define _VOLUME_DIRECTORY
 
 #include "Volume.h"
 #include "Common.h"
@@ -30,8 +31,7 @@
 namespace DiscIO
 {
 
-class CVolumeDirectory
-	: public IVolume
+class CVolumeDirectory : public IVolume
 {
 	public:
 
@@ -105,3 +105,5 @@ class CVolumeDirectory
 };
 
 } // namespace
+
+#endif
diff --git a/Source/Core/DiscIO/Src/VolumeGC.h b/Source/Core/DiscIO/Src/VolumeGC.h
@@ -15,7 +15,8 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#pragma once
+#ifndef _VOLUME_GC
+#define _VOLUME_GC
 
 #include "Volume.h"
 #include "Blob.h"
@@ -44,3 +45,5 @@ class CVolumeGC	: public IVolume
 };
 
 } // namespace
+
+#endif
diff --git a/Source/Core/DiscIO/Src/VolumeWad.h b/Source/Core/DiscIO/Src/VolumeWad.h
@@ -15,7 +15,8 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#pragma once
+#ifndef _VOLUME_WAD
+#define _VOLUME_WAD
 
 #include "Volume.h"
 #include "Blob.h"
@@ -50,3 +51,5 @@ class CVolumeWAD : public IVolume
 };
 
 } // namespace
+
+#endif
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -455,11 +455,11 @@ const char *GenerateVertexShader(u32 components, bool D3D)
 		WRITE(p, "o.tex3.w = o.pos.w;\n");
 	}
 
-	// Why are we adding w to z?
 	if (!D3D) {
-		// scale to gl clip space
+		// scale to gl clip space - which is -o.pos.w to o.pos.w, hence the addition.
 		WRITE(p, "o.pos.z = (o.pos.z * 2.0f) + o.pos.w;\n");
 	} else {
+
 		WRITE(p, "o.pos.z = o.pos.z + o.pos.w;\n");
 	}
 

diff --git a/Source/Core/VideoCommon/Src/XFStructs.cpp b/Source/Core/VideoCommon/Src/XFStructs.cpp
@@ -174,13 +174,13 @@ void LoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData)
 			// paper mario writes 16777216.0f, 1677721.75
 			// Killer 7 writes 16777216.0f here
 			case XFMEM_SETZSCALE:
-				WARN_LOG(VIDEO, "Set ZScale : %x=%x\n", address, data);
+				INFO_LOG(VIDEO, "Set ZScale : %x=%x\n", address, data);
 				break;
 
 			// paper mario writes 16777216.0f, 5033165.0f
 			// Killer 7 alterns this between 16777216.0f and 16710107.0f
             case XFMEM_SETZOFFSET:
-				WARN_LOG(VIDEO, "Set ZOffset : %x=%x\n", address, data);
+				INFO_LOG(VIDEO, "Set ZOffset : %x=%x\n", address, data);
 				break;
 
 			// --------------
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     		else
     		{
-    			PanicAlert("NANDContentLoader: error opening %s", szFilename);
+    			ERROR_LOG(DISCIO, "NANDContentLoader: error opening %s", szFilename);
     		}
     	}
@@ Expand Down @@