From 0653b9ec119e01dccffaa532aee54835e1d38a74 Mon Sep 17 00:00:00 2001
From: mtabachenko <mtabachenko@users.sf.net>
Date: Sun, 8 Feb 2009 21:42:16 +0000
Subject: [PATCH] winport: - fix Intel C++ project;

---
 desmume/src/rasterize.cpp                | 12 +++++-----
 desmume/src/windows/DeSmuME_Intel.icproj | 22 ++++++++++-------
 desmume/src/windows/DeSmuME_Intel.vcproj | 30 +++++++++++++++++-------
 3 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/desmume/src/rasterize.cpp b/desmume/src/rasterize.cpp
index bf9e99ab4..af18e92ec 100644
--- a/desmume/src/rasterize.cpp
+++ b/desmume/src/rasterize.cpp
@@ -40,8 +40,8 @@
 using std::min;
 using std::max;
 
-template<typename T> T min(T a, T b, T c) { return min(min(a,b),c); }
-template<typename T> T max(T a, T b, T c) { return max(max(a,b),c); }
+template<typename T> T _min(T a, T b, T c) { return min(min(a,b),c); }
+template<typename T> T _max(T a, T b, T c) { return max(max(a,b),c); }
 
 static int polynum;
 
@@ -403,10 +403,10 @@ static void triangle_from_devmaster()
     const int FDY31 = DY31 << 4;
 
     // Bounding rectangle
-    int minx = (min(X1, X2, X3) + 0xF) >> 4;
-    int maxx = (max(X1, X2, X3) + 0xF) >> 4;
-    int miny = (min(Y1, Y2, Y3) + 0xF) >> 4;
-    int maxy = (max(Y1, Y2, Y3) + 0xF) >> 4;
+    int minx = (_min(X1, X2, X3) + 0xF) >> 4;
+    int maxx = (_max(X1, X2, X3) + 0xF) >> 4;
+    int miny = (_min(Y1, Y2, Y3) + 0xF) >> 4;
+    int maxy = (_max(Y1, Y2, Y3) + 0xF) >> 4;
 
 	int desty = miny;
 
diff --git a/desmume/src/windows/DeSmuME_Intel.icproj b/desmume/src/windows/DeSmuME_Intel.icproj
index c0e6c68a7..1db8d4b5f 100644
--- a/desmume/src/windows/DeSmuME_Intel.icproj
+++ b/desmume/src/windows/DeSmuME_Intel.icproj
@@ -5,7 +5,7 @@
 	Name="DeSmuME_Intel"
 	ProjectGUID="{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}"
 	VCNestedProjectGUID="{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
-	VCNestedProjectCRC32="2631812102"
+	VCNestedProjectCRC32="2055535478"
 	VCNestedProjectFileName="DeSmuME_Intel.vcproj">
 	<Platforms>
 		<Platform 
@@ -40,7 +40,7 @@
 				Name="LinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)_debug.exe"
 				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib"
+				AdditionalDependencies="gdiplus\gdiplus.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib"
 				GenerateDebugInformation="1"
 				GenerateMapFile="1"
 				RandomizedBaseAddress="1"
@@ -104,7 +104,7 @@
 				Name="LinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)_interim_sse2.exe"
 				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
+				AdditionalDependencies="gdiplus\gdiplus.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
 				GenerateDebugInformation="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -165,7 +165,7 @@
 				Name="LinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)_interim.exe"
 				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
+				AdditionalDependencies="gdiplus\gdiplus.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
 				GenerateDebugInformation="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -226,7 +226,7 @@
 				Name="LinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
+				AdditionalDependencies="gdiplus\gdiplus.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
 				GenerateDebugInformation="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -290,7 +290,7 @@
 				Name="LinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)_sse2.exe"
 				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
+				AdditionalDependencies="gdiplus\gdiplus.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
 				GenerateDebugInformation="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -377,6 +377,8 @@
 			RelativePath="..\NDSSystem.h"/>
 		<File 
 			RelativePath="..\OGLRender.h"/>
+		<File 
+			RelativePath="..\rasterize.h"/>
 		<File 
 			RelativePath="..\readwrite.h"/>
 		<File 
@@ -395,6 +397,8 @@
 			RelativePath="..\softrender_config.h"/>
 		<File 
 			RelativePath="..\SPU.h"/>
+		<File 
+			RelativePath="..\texcache.h"/>
 		<File 
 			RelativePath="..\thumb_instructions.h"/>
 		<File 
@@ -447,8 +451,6 @@
 			RelativePath="..\font_eng.inc"/>
 		<File 
 			RelativePath="..\instruction_tabdef.inc"/>
-		<File 
-			RelativePath="..\shaders.h"/>
 		<File 
 			RelativePath="..\thumb_tabdef.inc"/>
 		<File 
@@ -611,6 +613,8 @@
 			RelativePath="..\NDSSystem.cpp"/>
 		<File 
 			RelativePath="..\OGLRender.cpp"/>
+		<File 
+			RelativePath="..\rasterize.cpp"/>
 		<File 
 			RelativePath="..\readwrite.cpp"/>
 		<File 
@@ -625,6 +629,8 @@
 			RelativePath="..\softrender.cpp"/>
 		<File 
 			RelativePath="..\SPU.cpp"/>
+		<File 
+			RelativePath="..\texcache.cpp"/>
 		<File 
 			RelativePath="..\thumb_instructions.cpp"/>
 		<File 
diff --git a/desmume/src/windows/DeSmuME_Intel.vcproj b/desmume/src/windows/DeSmuME_Intel.vcproj
index 1c51969f4..089fc0947 100644
--- a/desmume/src/windows/DeSmuME_Intel.vcproj
+++ b/desmume/src/windows/DeSmuME_Intel.vcproj
@@ -71,7 +71,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib"
+				AdditionalDependencies="gdiplus\gdiplus.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_debug.exe"
 				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
 				GenerateDebugInformation="true"
@@ -161,7 +161,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
+				AdditionalDependencies="gdiplus\gdiplus.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_interim_sse2.exe"
 				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
 				GenerateDebugInformation="true"
@@ -250,7 +250,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
+				AdditionalDependencies="gdiplus\gdiplus.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_interim.exe"
 				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
 				GenerateDebugInformation="true"
@@ -339,7 +339,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
+				AdditionalDependencies="gdiplus\gdiplus.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
 				GenerateDebugInformation="true"
@@ -429,7 +429,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
+				AdditionalDependencies="gdiplus\gdiplus.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_sse2.exe"
 				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
 				GenerateDebugInformation="true"
@@ -552,6 +552,10 @@
 					RelativePath="..\OGLRender.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\rasterize.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\readwrite.cpp"
 					>
@@ -580,6 +584,10 @@
 					RelativePath="..\SPU.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\texcache.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\thumb_instructions.cpp"
 					>
@@ -973,10 +981,6 @@
 				RelativePath="..\instruction_tabdef.inc"
 				>
 			</File>
-			<File
-				RelativePath="..\shaders.h"
-				>
-			</File>
 			<File
 				RelativePath="..\thumb_tabdef.inc"
 				>
@@ -1188,6 +1192,10 @@
 					RelativePath="..\OGLRender.h"
 					>
 				</File>
+				<File
+					RelativePath="..\rasterize.h"
+					>
+				</File>
 				<File
 					RelativePath="..\readwrite.h"
 					>
@@ -1224,6 +1232,10 @@
 					RelativePath="..\SPU.h"
 					>
 				</File>
+				<File
+					RelativePath="..\texcache.h"
+					>
+				</File>
 				<File
 					RelativePath="..\thumb_instructions.h"
 					>