From 003375d3755fe06227894e941b177491770c17fe Mon Sep 17 00:00:00 2001
From: truelight <truelight@openttd.org>
Date: Sun, 17 Jun 2007 20:30:28 +0000
Subject: (svn r10190) -Codechange: merged renderer and blitter to one single
 class API: blitter -Codechange: introduced a hierachy of blitters to avoid a
 lot of code duplication  Note: this allows much easier adding other types of
 video-drivers, like OpenGL

---
 projects/generate            |  2 +-
 projects/openttd.vcproj      | 42 +++++++++++++---------------------
 projects/openttd_vs80.vcproj | 54 +++++++++++++++++---------------------------
 3 files changed, 38 insertions(+), 60 deletions(-)

(limited to 'projects')

diff --git a/projects/generate b/projects/generate
index e218d9634..dc43f6be0 100755
--- a/projects/generate
+++ b/projects/generate
@@ -40,7 +40,7 @@ file_prefix="..\\\\src\\\\"
 
 safety_check() {
 	li=""
-	for i in `cat $1 | grep -v "#" | xargs -n 1 basename | sort`; do
+	for i in `cat $1 | grep -v "#\|ottdres.rc\|win32.cpp\|win32_v.cpp" | xargs -n 1 basename | sort`; do
 		if [ "$li" = "$i" ]; then
 			echo " !! ERROR !!"
 			echo ""
diff --git a/projects/openttd.vcproj b/projects/openttd.vcproj
index 899464bf8..de6df4f63 100644
--- a/projects/openttd.vcproj
+++ b/projects/openttd.vcproj
@@ -967,12 +967,24 @@
 		<Filter
 			Name="Blitters"
 			Filter="">
+			<File
+				RelativePath=".\..\src\blitter\32bpp_base.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\blitter\32bpp_base.hpp">
+			</File>
 			<File
 				RelativePath=".\..\src\blitter\32bpp_simple.cpp">
 			</File>
 			<File
 				RelativePath=".\..\src\blitter\32bpp_simple.hpp">
 			</File>
+			<File
+				RelativePath=".\..\src\blitter\8bpp_base.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\blitter\8bpp_base.hpp">
+			</File>
 			<File
 				RelativePath=".\..\src\blitter\8bpp_debug.cpp">
 			</File>
@@ -992,7 +1004,10 @@
 				RelativePath=".\..\src\blitter\8bpp_simple.hpp">
 			</File>
 			<File
-				RelativePath=".\..\src\blitter\blitter.hpp">
+				RelativePath=".\..\src\blitter\base.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\blitter\factory.hpp">
 			</File>
 			<File
 				RelativePath=".\..\src\blitter\null.cpp">
@@ -1020,31 +1035,6 @@
 				RelativePath=".\..\src\spriteloader\spriteloader.hpp">
 			</File>
 		</Filter>
-		<Filter
-			Name="Renderer"
-			Filter="">
-			<File
-				RelativePath=".\..\src\renderer\32bpp.cpp">
-			</File>
-			<File
-				RelativePath=".\..\src\renderer\32bpp.hpp">
-			</File>
-			<File
-				RelativePath=".\..\src\renderer\8bpp.cpp">
-			</File>
-			<File
-				RelativePath=".\..\src\renderer\8bpp.hpp">
-			</File>
-			<File
-				RelativePath=".\..\src\renderer\null.cpp">
-			</File>
-			<File
-				RelativePath=".\..\src\renderer\null.hpp">
-			</File>
-			<File
-				RelativePath=".\..\src\renderer\renderer.hpp">
-			</File>
-		</Filter>
 		<Filter
 			Name="NewGRF"
 			Filter="">
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 93f7d1241..e58eb48b2 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -1511,6 +1511,14 @@
 		<Filter
 			Name="Blitters"
 			>
+			<File
+				RelativePath=".\..\src\blitter\32bpp_base.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\blitter\32bpp_base.hpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\blitter\32bpp_simple.cpp"
 				>
@@ -1519,6 +1527,14 @@
 				RelativePath=".\..\src\blitter\32bpp_simple.hpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\blitter\8bpp_base.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\blitter\8bpp_base.hpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\blitter\8bpp_debug.cpp"
 				>
@@ -1544,7 +1560,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\blitter\blitter.hpp"
+				RelativePath=".\..\src\blitter\base.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\blitter\factory.hpp"
 				>
 			</File>
 			<File
@@ -1580,38 +1600,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Renderer"
-			>
-			<File
-				RelativePath=".\..\src\renderer\32bpp.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\renderer\32bpp.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\renderer\8bpp.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\renderer\8bpp.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\renderer\null.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\renderer\null.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\renderer\renderer.hpp"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="NewGRF"
 			>
-- 
cgit v1.2.3-70-g09d2