diff --git a/ChangeLog b/ChangeLog
index 9d6080484..7986be529 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-16  Tomas Frydrych  <tf@o-hand.com>
+
+	* build/msvc_2k5
+	Added MSVC project files.
+
 2007-10-16  Emmanuele bassi  <ebassi@openedhand.com>
 
 	* clutter/clutter-color.c: Copy the alpha when shading.
diff --git a/build/msvc_2k5/README b/build/msvc_2k5/README
new file mode 100644
index 000000000..b6dc50a41
--- /dev/null
+++ b/build/msvc_2k5/README
@@ -0,0 +1,62 @@
+
+INTRODUCTION
+============
+Clutter is an open source software library for creating fast, visually rich and animated 
+graphical user interfaces. For more information see http://clutter-project.org
+
+
+BUILDING CLUTTER
+================
+Currently only building with MSVC is supported (please feel free to contribute a different 
+build system.
+
+To build clutter, you will need runtime + dev libraries and headers for:
+
+glib & co.
+----------
+glib, gobject, gmodule, gdk pixbuf, freetype, fontconfig, pango, pangoft2, gettext, iconv,
+expat, these can be found at Tor Lillqvist's site, http://www.gimp.org/~tml/gimp/win32/. 
+The simplest way to install the runtimes is probably to install Gimp (http://gimp.org), but 
+the dev packages you will need to install by hand (not forgetting to tell your MSVC where 
+to look for the includes and libs).
+
+In addition to the libs, you will also need glib-genmarshal and glib-mkenums programs, 
+both of which come with the glib developement packages, but make sure that the releveant
+bin directory is added to your MSVC path; glib-mkenums is a perl script, so you will also 
+need perl installed in MSVC path. Unfortunately, due to the severe limitations of the 
+cmd.exe shell, I have ended up hardcoding the location of glib-mkmenus to the custom build 
+rules for clutter-enum-types.c.in and clutter-enum-types.h.in, so you will need to edit 
+those to match your install (if you can come up with a better way of doing this, patches 
+are, of course, welcome).
+
+SDL
+---
+The windows port uses sdl backend; you can get the necessary files from http://libsdl.org/
+(or feel free to write a different backend).
+
+GLee
+----
+Believe it or not, windows in 2007 only supports OpenGL 1.1 specification (which is a
+decade old). Glee is a library by Ben Woodhouse, which wraps the OpenGL extension API
+and eliminates the need to load any post 1.1 OpenGL functions (up to standard 2.2) as 
+extensions; you can get it from http://elf-stone.com/glee.php.
+
+Known Issues
+============
+
+* Could not include clutter-marshal.h: no such a file or directory -- this sometimes happens
+for reasons unknown. clutter-marshal.h is generated from the clutter-marshal.list; compiling 
+clutter-marshal.list twice in succession usually fixes this.
+
+* test-perspective:
+There are some issues with the SDL backend running in fullscreen mode (it does not work).
+
+* test-offscreen:
+Offscreen rendering is currently not supported by the SDL backend; feel free to fix this.
+
+* test-textures:
+Does not work; unsure of the causes.
+
+Bugs
+====
+Please report bugs, submit patches, etc., to http://bugzilla.o-hand.com/
diff --git a/build/msvc_2k5/clutter-version.h b/build/msvc_2k5/clutter-version.h
new file mode 100644
index 000000000..930ae5adf
--- /dev/null
+++ b/build/msvc_2k5/clutter-version.h
@@ -0,0 +1,28 @@
+#ifndef __CLUTTER_VERSION_H__
+#define __CLUTTER_VERSION_H__
+
+/* Version info, needs to be set for each release
+ * NB: this file lives in the msvc project directory, not
+ *     the clutter root !!!
+ */
+#define CLUTTER_MAJOR_VERSION   0
+#define CLUTTER_MINOR_VERSION   5
+#define CLUTTER_MICRO_VERSION   0
+#define CLUTTER_VERSION         0.5.0
+#define CLUTTER_VERSION_S       "0.5.0"
+
+#define CLUTTER_FLAVOUR         "sdl"
+#define CLUTTER_COGL            "gl"
+#define CLUTTER_NO_FPU          0
+
+/* The rest needs no modificactions */
+
+#define CLUTTER_VERSION_HEX     ((CLUTTER_MAJOR_VERSION << 24) | \
+                                 (CLUTTER_MINOR_VERSION << 16) | \
+                                 (CLUTTER_MICRO_VERSION << 8))
+#define CLUTTER_CHECK_VERSION(major,minor,micro) \
+        (CLUTTER_MAJOR_VERSION > (major) || \
+         (CLUTTER_MAJOR_VERSION == (major) && CLUTTER_MINOR_VERSION > (minor)) || \
+         (CLUTTER_MAJOR_VERSION == (major) && CLUTTER_MINOR_VERSION == (minor) && CLUTTER_MICRO_VERSION >= (micro)))
+
+#endif /* __CLUTTER_VERSION_H__ */
diff --git a/build/msvc_2k5/clutter.sln b/build/msvc_2k5/clutter.sln
new file mode 100644
index 000000000..17d83d888
--- /dev/null
+++ b/build/msvc_2k5/clutter.sln
@@ -0,0 +1,131 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clutter", "clutter.vcproj", "{84FDDB4F-95DF-4C21-AA77-7BC3B067CC0E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-behave", "test-behave.vcproj", "{21B366B4-1FFE-433B-AFE2-4D32FFCF8B1B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{84FDDB4F-95DF-4C21-AA77-7BC3B067CC0E} = {84FDDB4F-95DF-4C21-AA77-7BC3B067CC0E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-actors", "test-actors.vcproj", "{E21E35F4-C066-4518-939E-D07064F99E7A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{84FDDB4F-95DF-4C21-AA77-7BC3B067CC0E} = {84FDDB4F-95DF-4C21-AA77-7BC3B067CC0E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-scale", "test-scale.vcproj", "{5F3D08CA-C15F-4FE6-9386-056F79A66164}"
+	ProjectSection(ProjectDependencies) = postProject
+		{84FDDB4F-95DF-4C21-AA77-7BC3B067CC0E} = {84FDDB4F-95DF-4C21-AA77-7BC3B067CC0E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-text", "test-text.vcproj", "{823840F0-34AA-4ED4-B361-1A208C5FEFD4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-project", "test-project.vcproj", "{43EB7AC1-45F9-45A3-9C1E-BF6A91CD878A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-entry", "test-entry.vcproj", "{6D96E4D8-32C3-4B5E-803F-3F10E034312A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-perspective", "test-perspective.vcproj", "{9C8637C0-AF4C-42B8-A3CE-F4F8CA3DC0EA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-boxes", "test-boxes.vcproj", "{9137DD4C-14F0-4570-95D6-3A776C57B77F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-depth", "test-depth.vcproj", "{0C053F1D-954A-45BA-88F6-15B76DDC4B68}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-events", "test-events.vcproj", "{1FFA8E34-3012-4C96-BC6B-B4EB0D5445E6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-offscreen", "test-offscreen.vcproj", "{B662224F-3155-4D11-844C-AA1628994DB5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-rotate", "test-rotate.vcproj", "{19C0D22A-05BA-4B40-8D58-B2D013AEF48B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-score", "test-score.vcproj", "{D5499ECD-B2E9-4790-B8C5-DBA2240FDB40}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-script", "test-script.vcproj", "{9D2F4B49-85B8-4A8E-9CB6-610624EA2194}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-textures", "test-textures.vcproj", "{616A80B9-8CD4-4ADF-B39B-23107326F663}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-threads", "test-threads.vcproj", "{589E1F92-248D-485D-B9FB-E1C6161801C0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-timeline", "test-timeline.vcproj", "{62835DE2-B950-4049-A947-5DB6080E7396}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{84FDDB4F-95DF-4C21-AA77-7BC3B067CC0E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{84FDDB4F-95DF-4C21-AA77-7BC3B067CC0E}.Debug|Win32.Build.0 = Debug|Win32
+		{84FDDB4F-95DF-4C21-AA77-7BC3B067CC0E}.Release|Win32.ActiveCfg = Release|Win32
+		{84FDDB4F-95DF-4C21-AA77-7BC3B067CC0E}.Release|Win32.Build.0 = Release|Win32
+		{21B366B4-1FFE-433B-AFE2-4D32FFCF8B1B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{21B366B4-1FFE-433B-AFE2-4D32FFCF8B1B}.Debug|Win32.Build.0 = Debug|Win32
+		{21B366B4-1FFE-433B-AFE2-4D32FFCF8B1B}.Release|Win32.ActiveCfg = Release|Win32
+		{21B366B4-1FFE-433B-AFE2-4D32FFCF8B1B}.Release|Win32.Build.0 = Release|Win32
+		{E21E35F4-C066-4518-939E-D07064F99E7A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E21E35F4-C066-4518-939E-D07064F99E7A}.Debug|Win32.Build.0 = Debug|Win32
+		{E21E35F4-C066-4518-939E-D07064F99E7A}.Release|Win32.ActiveCfg = Release|Win32
+		{E21E35F4-C066-4518-939E-D07064F99E7A}.Release|Win32.Build.0 = Release|Win32
+		{5F3D08CA-C15F-4FE6-9386-056F79A66164}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5F3D08CA-C15F-4FE6-9386-056F79A66164}.Debug|Win32.Build.0 = Debug|Win32
+		{5F3D08CA-C15F-4FE6-9386-056F79A66164}.Release|Win32.ActiveCfg = Release|Win32
+		{5F3D08CA-C15F-4FE6-9386-056F79A66164}.Release|Win32.Build.0 = Release|Win32
+		{823840F0-34AA-4ED4-B361-1A208C5FEFD4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{823840F0-34AA-4ED4-B361-1A208C5FEFD4}.Debug|Win32.Build.0 = Debug|Win32
+		{823840F0-34AA-4ED4-B361-1A208C5FEFD4}.Release|Win32.ActiveCfg = Release|Win32
+		{823840F0-34AA-4ED4-B361-1A208C5FEFD4}.Release|Win32.Build.0 = Release|Win32
+		{43EB7AC1-45F9-45A3-9C1E-BF6A91CD878A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{43EB7AC1-45F9-45A3-9C1E-BF6A91CD878A}.Debug|Win32.Build.0 = Debug|Win32
+		{43EB7AC1-45F9-45A3-9C1E-BF6A91CD878A}.Release|Win32.ActiveCfg = Release|Win32
+		{43EB7AC1-45F9-45A3-9C1E-BF6A91CD878A}.Release|Win32.Build.0 = Release|Win32
+		{6D96E4D8-32C3-4B5E-803F-3F10E034312A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6D96E4D8-32C3-4B5E-803F-3F10E034312A}.Debug|Win32.Build.0 = Debug|Win32
+		{6D96E4D8-32C3-4B5E-803F-3F10E034312A}.Release|Win32.ActiveCfg = Release|Win32
+		{6D96E4D8-32C3-4B5E-803F-3F10E034312A}.Release|Win32.Build.0 = Release|Win32
+		{9C8637C0-AF4C-42B8-A3CE-F4F8CA3DC0EA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9C8637C0-AF4C-42B8-A3CE-F4F8CA3DC0EA}.Debug|Win32.Build.0 = Debug|Win32
+		{9C8637C0-AF4C-42B8-A3CE-F4F8CA3DC0EA}.Release|Win32.ActiveCfg = Release|Win32
+		{9C8637C0-AF4C-42B8-A3CE-F4F8CA3DC0EA}.Release|Win32.Build.0 = Release|Win32
+		{9137DD4C-14F0-4570-95D6-3A776C57B77F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9137DD4C-14F0-4570-95D6-3A776C57B77F}.Debug|Win32.Build.0 = Debug|Win32
+		{9137DD4C-14F0-4570-95D6-3A776C57B77F}.Release|Win32.ActiveCfg = Release|Win32
+		{9137DD4C-14F0-4570-95D6-3A776C57B77F}.Release|Win32.Build.0 = Release|Win32
+		{0C053F1D-954A-45BA-88F6-15B76DDC4B68}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0C053F1D-954A-45BA-88F6-15B76DDC4B68}.Debug|Win32.Build.0 = Debug|Win32
+		{0C053F1D-954A-45BA-88F6-15B76DDC4B68}.Release|Win32.ActiveCfg = Release|Win32
+		{0C053F1D-954A-45BA-88F6-15B76DDC4B68}.Release|Win32.Build.0 = Release|Win32
+		{1FFA8E34-3012-4C96-BC6B-B4EB0D5445E6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1FFA8E34-3012-4C96-BC6B-B4EB0D5445E6}.Debug|Win32.Build.0 = Debug|Win32
+		{1FFA8E34-3012-4C96-BC6B-B4EB0D5445E6}.Release|Win32.ActiveCfg = Release|Win32
+		{1FFA8E34-3012-4C96-BC6B-B4EB0D5445E6}.Release|Win32.Build.0 = Release|Win32
+		{B662224F-3155-4D11-844C-AA1628994DB5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B662224F-3155-4D11-844C-AA1628994DB5}.Debug|Win32.Build.0 = Debug|Win32
+		{B662224F-3155-4D11-844C-AA1628994DB5}.Release|Win32.ActiveCfg = Release|Win32
+		{B662224F-3155-4D11-844C-AA1628994DB5}.Release|Win32.Build.0 = Release|Win32
+		{19C0D22A-05BA-4B40-8D58-B2D013AEF48B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{19C0D22A-05BA-4B40-8D58-B2D013AEF48B}.Debug|Win32.Build.0 = Debug|Win32
+		{19C0D22A-05BA-4B40-8D58-B2D013AEF48B}.Release|Win32.ActiveCfg = Release|Win32
+		{19C0D22A-05BA-4B40-8D58-B2D013AEF48B}.Release|Win32.Build.0 = Release|Win32
+		{D5499ECD-B2E9-4790-B8C5-DBA2240FDB40}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D5499ECD-B2E9-4790-B8C5-DBA2240FDB40}.Debug|Win32.Build.0 = Debug|Win32
+		{D5499ECD-B2E9-4790-B8C5-DBA2240FDB40}.Release|Win32.ActiveCfg = Release|Win32
+		{D5499ECD-B2E9-4790-B8C5-DBA2240FDB40}.Release|Win32.Build.0 = Release|Win32
+		{9D2F4B49-85B8-4A8E-9CB6-610624EA2194}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9D2F4B49-85B8-4A8E-9CB6-610624EA2194}.Debug|Win32.Build.0 = Debug|Win32
+		{9D2F4B49-85B8-4A8E-9CB6-610624EA2194}.Release|Win32.ActiveCfg = Release|Win32
+		{9D2F4B49-85B8-4A8E-9CB6-610624EA2194}.Release|Win32.Build.0 = Release|Win32
+		{616A80B9-8CD4-4ADF-B39B-23107326F663}.Debug|Win32.ActiveCfg = Debug|Win32
+		{616A80B9-8CD4-4ADF-B39B-23107326F663}.Debug|Win32.Build.0 = Debug|Win32
+		{616A80B9-8CD4-4ADF-B39B-23107326F663}.Release|Win32.ActiveCfg = Release|Win32
+		{616A80B9-8CD4-4ADF-B39B-23107326F663}.Release|Win32.Build.0 = Release|Win32
+		{589E1F92-248D-485D-B9FB-E1C6161801C0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{589E1F92-248D-485D-B9FB-E1C6161801C0}.Debug|Win32.Build.0 = Debug|Win32
+		{589E1F92-248D-485D-B9FB-E1C6161801C0}.Release|Win32.ActiveCfg = Release|Win32
+		{589E1F92-248D-485D-B9FB-E1C6161801C0}.Release|Win32.Build.0 = Release|Win32
+		{62835DE2-B950-4049-A947-5DB6080E7396}.Debug|Win32.ActiveCfg = Debug|Win32
+		{62835DE2-B950-4049-A947-5DB6080E7396}.Debug|Win32.Build.0 = Debug|Win32
+		{62835DE2-B950-4049-A947-5DB6080E7396}.Release|Win32.ActiveCfg = Release|Win32
+		{62835DE2-B950-4049-A947-5DB6080E7396}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/build/msvc_2k5/clutter.vcproj b/build/msvc_2k5/clutter.vcproj
new file mode 100644
index 000000000..a904bb23e
--- /dev/null
+++ b/build/msvc_2k5/clutter.vcproj
@@ -0,0 +1,772 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="clutter"
+	ProjectGUID="{84FDDB4F-95DF-4C21-AA77-7BC3B067CC0E}"
+	RootNamespace="clutter"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				Description="Creating config.h"
+				CommandLine="cp config.h.msvc config.h"
+				ExcludedFromBuild="true"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../..;../../../..;../../clutter/cogl;../../clutter/cogl/gl;../../clutter/pango"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CLUTTER_EXPORTS;HAVE_CLUTTER_SDL=1;HAVE_COGL_GL=1;CLUTTER_ENABLE_DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="sdl.lib glib-2.0.lib gobject-2.0.lib gmodule-2.0.lib fontconfig.lib pango-1.0.lib pangoft2-1.0.lib opengl32.lib gdk_pixbuf-2.0.lib freetype.lib"
+				OutputFile="$(OutDir)\$(ProjectName)_d.dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""
+				ModuleDefinitionFile="$(TargetDir)$(TargetName).def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="generate .def file"
+				CommandLine="dumpbin /EXPORTS $(OutDir)\$(ProjectName).dll"
+				ExcludedFromBuild="true"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../..;../../../..;../../clutter/cogl;../../clutter/cogl/gl;../../clutter/pango"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CLUTTER_EXPORTS;"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="sdl.lib glib-2.0.lib gobject-2.0.lib gmodule-2.0.lib fontconfig.lib pango-1.0.lib pangoft2-1.0.lib opengl32.lib gdk_pixbuf-2.0.lib freetype.lib"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(TargetDir)$(TargetName).def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="Copying pngs into build dir"
+				CommandLine=""
+				ExcludedFromBuild="true"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\clutter\clutter-actor.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-alpha.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\sdl\clutter-backend-sdl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-backend.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-behaviour-bspline.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-behaviour-depth.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-behaviour-ellipse.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-behaviour-opacity.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-behaviour-path.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-behaviour-rotate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-behaviour-scale.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-behaviour.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-box.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-clone-texture.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-color.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-container.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-debug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-effect.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-entry.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-enum-types.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-event.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-feature.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-fixed.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-group.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-hbox.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-keysyms-table.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-keysyms.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-label.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-layout.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-main.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-marshal.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-media.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-private.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-rectangle.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-score.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-script-private.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-script.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\sdl\clutter-sdl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\sdl\clutter-stage-sdl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-stage.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-texture.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-timeline.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-timeout-pool.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-types.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-units.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-util.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-vbox.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-version.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\cogl\gl\cogl-defines.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\cogl\cogl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\json\json-generator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\json\json-glib.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\json\json-marshal.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\json\json-parser.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\json\json-types.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\pango\pangoclutter-private.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\pango\pangoclutter.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath=".\version.rc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\clutter\clutter-actor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-alpha.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\sdl\clutter-backend-sdl.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-backend.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-behaviour-bspline.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-behaviour-depth.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-behaviour-ellipse.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-behaviour-opacity.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-behaviour-path.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-behaviour-rotate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-behaviour-scale.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-behaviour.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-box.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-clone-texture.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-color.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-container.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-effect.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-entry.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-enum-types.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\sdl\clutter-event-sdl.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-event.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-feature.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-fixed.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-group.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-hbox.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-label.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-layout.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-main.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-marshal.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-media.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-rectangle.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-score.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-script.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\sdl\clutter-stage-sdl.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-stage.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-texture.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-timeline.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-timeout-pool.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\clutter-vbox.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\cogl\gl\cogl.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\json\json-array.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\json\json-generator.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\json\json-marshal.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\json\json-node.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\json\json-object.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\json\json-parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\pango\pangoclutter-font.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\pango\pangoclutter-fontmap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\clutter\pango\pangoclutter-render.c"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\..\clutter\clutter-enum-types.c.in"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating $(InputDir)$(InputName)"
+					CommandLine="if exist $(InputDir)clutter-marshal.h del $(InputDir)clutter-marshal.h&#x0D;&#x0A;if exist $(InputDir)clutter-enum-types.h del $(InputDir)clutter-enum-types.h&#x0D;&#x0A;echo @echo off &gt;$(TargetDir)enum.bat&#x0D;&#x0A;echo pushd $(InputDir) &gt;&gt;$(TargetDir)enum.bat&#x0D;&#x0A;echo set H_LIST=&gt;&gt; $(TargetDir)enum.bat&#x0D;&#x0A;echo for %%%%i in (*.h) do set H_LIST=!H_LIST! %%%%i&gt;&gt; $(TargetDir)enum.bat&#x0D;&#x0A;echo perl C:\msvcdevfiles\glib-dev-2.14.1\bin\glib-mkenums --template $(InputPath)  %%H_LIST%% ^&gt; $(InputDir)$(InputName) &gt;&gt; $(TargetDir)enum.bat&#x0D;&#x0A;echo popd &gt;&gt; $(TargetDir)enum.bat&#x0D;&#x0A;cmd /v:on /c $(TargetDir)/enum.bat&#x0D;&#x0A;"
+					Outputs="$(InputDir)$(InputName)"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating $(InputDir)$(InputName)"
+					CommandLine="if exist $(InputDir)clutter-marshal.h del $(InputDir)clutter-marshal.h&#x0D;&#x0A;if exist $(InputDir)clutter-enum-types.h del $(InputDir)clutter-enum-types.h&#x0D;&#x0A;echo @echo off &gt;$(TargetDir)enum.bat&#x0D;&#x0A;echo pushd $(InputDir) &gt;&gt;$(TargetDir)enum.bat&#x0D;&#x0A;echo set H_LIST=&gt;&gt; $(TargetDir)enum.bat&#x0D;&#x0A;echo for %%%%i in (*.h) do set H_LIST=!H_LIST! %%%%i&gt;&gt; $(TargetDir)enum.bat&#x0D;&#x0A;echo perl C:\msvcdevfiles\glib-dev-2.14.1\bin\glib-mkenums --template $(InputPath)  %%H_LIST%% ^&gt; $(InputDir)$(InputName) &gt;&gt; $(TargetDir)enum.bat&#x0D;&#x0A;echo popd &gt;&gt; $(TargetDir)enum.bat&#x0D;&#x0A;cmd /v:on /c $(TargetDir)/enum.bat&#x0D;&#x0A;"
+					Outputs="$(InputDir)$(InputName)"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\clutter\clutter-enum-types.h.in"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating clutter-enum-types.h"
+					CommandLine="if exist $(InputDir)clutter-marshal.h del $(InputDir)clutter-marshal.h&#x0D;&#x0A;if exist $(InputDir)clutter-enum-types.h del $(InputDir)clutter-enum-types.h&#x0D;&#x0A;echo @echo off &gt;$(TargetDir)enum.bat&#x0D;&#x0A;echo pushd $(InputDir) &gt;&gt;$(TargetDir)enum.bat&#x0D;&#x0A;echo set H_LIST=&gt;&gt; $(TargetDir)enum.bat&#x0D;&#x0A;echo for %%%%i in (*.h) do set H_LIST=!H_LIST! %%%%i&gt;&gt; $(TargetDir)enum.bat&#x0D;&#x0A;echo perl C:\msvcdevfiles\glib-dev-2.14.1\bin\glib-mkenums --template $(InputPath)  %%H_LIST%% ^&gt; $(InputDir)$(InputName) &gt;&gt; $(TargetDir)enum.bat&#x0D;&#x0A;echo popd &gt;&gt; $(TargetDir)enum.bat&#x0D;&#x0A;cmd /v:on /c $(TargetDir)/enum.bat&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="$(InputDir)clutter-enum-types.h"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating clutter-enum-types.h"
+					CommandLine="if exist $(InputDir)clutter-marshal.h del $(InputDir)clutter-marshal.h&#x0D;&#x0A;if exist $(InputDir)clutter-enum-types.h del $(InputDir)clutter-enum-types.h&#x0D;&#x0A;echo @echo off &gt;$(TargetDir)enum.bat&#x0D;&#x0A;echo pushd $(InputDir) &gt;&gt;$(TargetDir)enum.bat&#x0D;&#x0A;echo set H_LIST=&gt;&gt; $(TargetDir)enum.bat&#x0D;&#x0A;echo for %%%%i in (*.h) do set H_LIST=!H_LIST! %%%%i&gt;&gt; $(TargetDir)enum.bat&#x0D;&#x0A;echo perl C:\msvcdevfiles\glib-dev-2.14.1\bin\glib-mkenums --template $(InputPath)  %%H_LIST%% ^&gt; $(InputDir)$(InputName) &gt;&gt; $(TargetDir)enum.bat&#x0D;&#x0A;echo popd &gt;&gt; $(TargetDir)enum.bat&#x0D;&#x0A;cmd /v:on /c $(TargetDir)/enum.bat&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="$(InputDir)clutter-enum-types.h"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\clutter\clutter-marshal.list"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating clutter_marshal.h/c"
+					CommandLine="glib-genmarshal --prefix=clutter_marshal --header $(InputPath)  &gt; $(InputDir)$(InputName).h&#x0D;&#x0A;echo #include &quot;clutter-marshal.h&quot; &gt; $(InputDir)$(InputName).c&#x0D;&#x0A;glib-genmarshal --prefix=clutter_marshal --body $(InputPath)  &gt;&gt; $(InputDir)$(InputName).c&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="$(InputDir)$(InputName).h;$(InputDir)$(InputName).c"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating clutter_marshal.h/c"
+					CommandLine="glib-genmarshal --prefix=clutter_marshal --header $(InputPath)  &gt; $(InputDir)$(InputName).h&#x0D;&#x0A;echo #include &quot;clutter-marshal.h&quot; &gt; $(InputDir)$(InputName).c&#x0D;&#x0A;glib-genmarshal --prefix=clutter_marshal --body $(InputPath)  &gt;&gt; $(InputDir)$(InputName).c&#x0D;&#x0A;"
+					AdditionalDependencies="$(InputDir)clutter-enum-types.h;$(InputDir)clutter-enum-types.c"
+					Outputs="$(InputDir)$(InputName).h;$(InputDir)$(InputName).c"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\clutter\clutter-version.h.in"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Making clutter-version.h"
+					CommandLine="cp $(ProjectDir)$(InputName) $(InputDir)$(InputName)&#x0D;&#x0A;"
+					Outputs="$(InputDir)$(InputName)"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Making clutter-version.h"
+					CommandLine="cp $(ProjectDir)$(InputName) $(InputDir)$(InputName)&#x0D;&#x0A;"
+					Outputs="$(InputDir)$(InputName)"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\clutter.symbols"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="generating .def file"
+					CommandLine="if exist $(TargetDir)$(TargetName).def del $(TargetDir)$(TargetName).def&#x0D;&#x0A;echo EXPORTS &gt; $(TargetDir)$(TargetName).def&#x0D;&#x0A;type $(InputDir)clutter.symbols &gt;&gt; $(TargetDir)$(TargetName).def&#x0D;&#x0A;"
+					Outputs="clutter.def"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="generating clutter.def"
+					CommandLine="if exist $(TargetDir)$(TargetName).def del $(TargetDir)$(TargetName).def&#x0D;&#x0A;echo EXPORTS &gt; $(TargetDir)$(TargetName).def&#x0D;&#x0A;type $(InputDir)clutter.symbols &gt;&gt; $(TargetDir)$(TargetName).def&#x0D;&#x0A;"
+					Outputs="clutter.def"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath=".\README"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/msvc_2k5/test-actors.vcproj b/build/msvc_2k5/test-actors.vcproj
new file mode 100644
index 000000000..fe4bc1015
--- /dev/null
+++ b/build/msvc_2k5/test-actors.vcproj
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test-actors"
+	ProjectGUID="{E21E35F4-C066-4518-939E-D07064F99E7A}"
+	RootNamespace="testactors"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter_d.lib glib-2.0.lib gdk_pixbuf-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\.."
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter.lib glib-2.0.lib gdk_pixbuf-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\tests\redhand.png"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Copying $(InputFileName) to $(TargetDir)"
+					CommandLine="cp $(InputPath) $(TargetDir)$(InputFileName)&#x0D;&#x0A;"
+					Outputs="$(InputFileName)"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Copying $(InputFileName) to $(TargetDir)"
+					CommandLine="cp $(InputPath) $(TargetDir)$(InputFileName)&#x0D;&#x0A;"
+					Outputs="$(InputFileName)"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\tests\test-actors.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/msvc_2k5/test-behave.vcproj b/build/msvc_2k5/test-behave.vcproj
new file mode 100644
index 000000000..9f85c5e74
--- /dev/null
+++ b/build/msvc_2k5/test-behave.vcproj
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test-behave"
+	ProjectGUID="{21B366B4-1FFE-433b-AFE2-4D32FFCF8B1B}"
+	RootNamespace="testbehave"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter_d.lib glib-2.0.lib gdk_pixbuf-2.0.lib  gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\.."
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter.lib glib-2.0.lib gdk_pixbuf-2.0.lib  gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\tests\redhand.png"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Copying $(InputFileName) to $(TargetDir)"
+					CommandLine="cp $(InputPath) $(TargetDir)$(InputFileName)&#x0D;&#x0A;"
+					Outputs="$(InputFileName)"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Copying $(InputFileName) to $(TargetDir)"
+					CommandLine="cp $(InputPath) $(TargetDir)$(InputFileName)&#x0D;&#x0A;"
+					Outputs="$(InputFileName)"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\tests\test-behave.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/msvc_2k5/test-boxes.vcproj b/build/msvc_2k5/test-boxes.vcproj
new file mode 100644
index 000000000..70213176a
--- /dev/null
+++ b/build/msvc_2k5/test-boxes.vcproj
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test-boxes"
+	ProjectGUID="{9137DD4C-14F0-4570-95D6-3A776C57B77F}"
+	RootNamespace="testboxes"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter_d.lib glib-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\.."
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter.lib glib-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\tests\test-boxes.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/msvc_2k5/test-depth.vcproj b/build/msvc_2k5/test-depth.vcproj
new file mode 100644
index 000000000..37d93be28
--- /dev/null
+++ b/build/msvc_2k5/test-depth.vcproj
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test-depth"
+	ProjectGUID="{0C053F1D-954A-45BA-88F6-15B76DDC4B68}"
+	RootNamespace="testdepth"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter_d.lib glib-2.0.lib gdk_pixbuf-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\.."
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter.lib glib-2.0.lib gdk_pixbuf-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\tests\redhand.png"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Copying $(InputFileName) to $(TargetDir)"
+					CommandLine="cp $(InputPath) $(TargetDir)$(InputFileName)&#x0D;&#x0A;"
+					Outputs="$(InputFileName)"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Copying $(InputFileName) to $(TargetDir)"
+					CommandLine="cp $(InputPath) $(TargetDir)$(InputFileName)&#x0D;&#x0A;"
+					Outputs="$(InputFileName)"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\tests\test-depth.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/msvc_2k5/test-entry.vcproj b/build/msvc_2k5/test-entry.vcproj
new file mode 100644
index 000000000..ac8e27171
--- /dev/null
+++ b/build/msvc_2k5/test-entry.vcproj
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test-entry"
+	ProjectGUID="{6D96E4D8-32C3-4B5E-803F-3F10E034312A}"
+	RootNamespace="testentry"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter_d.lib glib-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\.."
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter.lib glib-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\tests\test-entry.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/msvc_2k5/test-events.vcproj b/build/msvc_2k5/test-events.vcproj
new file mode 100644
index 000000000..450900241
--- /dev/null
+++ b/build/msvc_2k5/test-events.vcproj
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test-events"
+	ProjectGUID="{1FFA8E34-3012-4C96-BC6B-B4EB0D5445E6}"
+	RootNamespace="testevents"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter_d.lib glib-2.0.lib sdl.lib pango-1.0.lib pangoft2-1.0.lib freetype.lib glee.lib gdk_pixbuf-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\.."
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter.lib glib-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\tests\test-events.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/msvc_2k5/test-offscreen.vcproj b/build/msvc_2k5/test-offscreen.vcproj
new file mode 100644
index 000000000..905b393db
--- /dev/null
+++ b/build/msvc_2k5/test-offscreen.vcproj
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test-offscreen"
+	ProjectGUID="{B662224F-3155-4D11-844C-AA1628994DB5}"
+	RootNamespace="testoffscreen"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter_d.lib glib-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\.."
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter.lib glib-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\tests\test-offscreen.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/msvc_2k5/test-perspective.vcproj b/build/msvc_2k5/test-perspective.vcproj
new file mode 100644
index 000000000..c457d4250
--- /dev/null
+++ b/build/msvc_2k5/test-perspective.vcproj
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test-perspective"
+	ProjectGUID="{9C8637C0-AF4C-42B8-A3CE-F4F8CA3DC0EA}"
+	RootNamespace="testsperspective"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter_d.lib glib-2.0.lib sdl.lib pango-1.0.lib pangoft2-1.0.lib freetype.lib glee.lib gdk_pixbuf-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\.."
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter.lib glib-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\tests\test-perspective.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/msvc_2k5/test-project.vcproj b/build/msvc_2k5/test-project.vcproj
new file mode 100644
index 000000000..3aae6da98
--- /dev/null
+++ b/build/msvc_2k5/test-project.vcproj
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test-project"
+	ProjectGUID="{43EB7AC1-45F9-45A3-9C1E-BF6A91CD878A}"
+	RootNamespace="testproject"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter_d.lib glib-2.0.lib sdl.lib pango-1.0.lib pangoft2-1.0.lib freetype.lib glee.lib gdk_pixbuf-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\.."
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter.lib glib-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\tests\test-project.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/msvc_2k5/test-rotate.vcproj b/build/msvc_2k5/test-rotate.vcproj
new file mode 100644
index 000000000..8352cec30
--- /dev/null
+++ b/build/msvc_2k5/test-rotate.vcproj
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test-rotate"
+	ProjectGUID="{19C0D22A-05BA-4B40-8D58-B2D013AEF48B}"
+	RootNamespace="testrotate"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter_d.lib glib-2.0.lib sdl.lib pango-1.0.lib pangoft2-1.0.lib freetype.lib glee.lib gdk_pixbuf-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\.."
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter.lib glib-2.0.lib gdk_pixbuf-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\tests\redhand.png"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Copying $(InputFileName) to $(TargetDir)"
+					CommandLine="cp $(InputPath) $(TargetDir)$(InputFileName)&#x0D;&#x0A;"
+					Outputs="$(InputFileName)"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Copying $(InputFileName) to $(TargetDir)"
+					CommandLine="cp $(InputPath) $(TargetDir)$(InputFileName)&#x0D;&#x0A;"
+					Outputs="$(InputFileName)"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\tests\test-rotate.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/msvc_2k5/test-scale.vcproj b/build/msvc_2k5/test-scale.vcproj
new file mode 100644
index 000000000..824f66f25
--- /dev/null
+++ b/build/msvc_2k5/test-scale.vcproj
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test-scale"
+	ProjectGUID="{5F3D08CA-C15F-4fe6-9386-056F79A66164}"
+	RootNamespace="testscale"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter_d.lib glib-2.0.lib sdl.lib pango-1.0.lib pangoft2-1.0.lib freetype.lib glee.lib gdk_pixbuf-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\.."
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter.lib glib-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\tests\test-scale.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/msvc_2k5/test-score.vcproj b/build/msvc_2k5/test-score.vcproj
new file mode 100644
index 000000000..d806b1dfe
--- /dev/null
+++ b/build/msvc_2k5/test-score.vcproj
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test-score"
+	ProjectGUID="{D5499ECD-B2E9-4790-B8C5-DBA2240FDB40}"
+	RootNamespace="testscore"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter_d.lib glib-2.0.lib sdl.lib pango-1.0.lib pangoft2-1.0.lib freetype.lib glee.lib gdk_pixbuf-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\.."
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter.lib glib-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\tests\test-score.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/msvc_2k5/test-script.vcproj b/build/msvc_2k5/test-script.vcproj
new file mode 100644
index 000000000..a52470ab2
--- /dev/null
+++ b/build/msvc_2k5/test-script.vcproj
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test-script"
+	ProjectGUID="{9D2F4B49-85B8-4A8E-9CB6-610624EA2194}"
+	RootNamespace="testscript"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter_d.lib glib-2.0.lib sdl.lib pango-1.0.lib pangoft2-1.0.lib freetype.lib glee.lib gdk_pixbuf-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\.."
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter.lib glib-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\tests\test-script.c"
+			>
+		</File>
+		<File
+			RelativePath="..\..\tests\test-script.json"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Copying json script $(InputFileName)"
+					CommandLine="cp $(InputPath) $(TargetDir)$(InputFileName)"
+					Outputs="$(TargetDir)$(InputFileName)"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Copying json script $(InputFileName)"
+					CommandLine="cp $(InputPath) $(TargetDir)$(InputFileName)"
+					Outputs="$(TargetDir)$(InputFileName)"
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/msvc_2k5/test-text.vcproj b/build/msvc_2k5/test-text.vcproj
new file mode 100644
index 000000000..33846b871
--- /dev/null
+++ b/build/msvc_2k5/test-text.vcproj
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test-text"
+	ProjectGUID="{823840F0-34AA-4ED4-B361-1A208C5FEFD4}"
+	RootNamespace="testtext"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				Description="Copying source to $(TargetDir)"
+				CommandLine="cd $(InputDir)&#x0D;&#x0A;cd ..\..\tests&#x0D;&#x0A;cp test-text.c $(TargetDir)test-text.c&#x0D;&#x0A;"
+				Outputs="$(TargetDir)test-text.c"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter_d.lib glib-2.0.lib sdl.lib pango-1.0.lib pangoft2-1.0.lib freetype.lib glee.lib gdk_pixbuf-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				Description="Copying source to $(TargetDir)"
+				CommandLine="cd $(InputDir)&#x0D;&#x0A;cd ..\..\tests&#x0D;&#x0A;cp test-text.c $(TargetDir)test-text.c&#x0D;&#x0A;"
+				Outputs="$(TargetDir)test-text.c"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\.."
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter.lib glib-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\tests\test-text.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/msvc_2k5/test-textures.vcproj b/build/msvc_2k5/test-textures.vcproj
new file mode 100644
index 000000000..ea70b4f02
--- /dev/null
+++ b/build/msvc_2k5/test-textures.vcproj
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test-textures"
+	ProjectGUID="{616A80B9-8CD4-4ADF-B39B-23107326F663}"
+	RootNamespace="testtextures"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter_d.lib glib-2.0.lib gdk_pixbuf-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\.."
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter.lib glib-2.0.lib gobject-2.0.lib gdk_pixbuf-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\tests\test-textures.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/msvc_2k5/test-threads.vcproj b/build/msvc_2k5/test-threads.vcproj
new file mode 100644
index 000000000..3cc16a577
--- /dev/null
+++ b/build/msvc_2k5/test-threads.vcproj
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test-threads"
+	ProjectGUID="{589E1F92-248D-485D-B9FB-E1C6161801C0}"
+	RootNamespace="testthreads"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter_d.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\.."
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\tests\test-threads.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/msvc_2k5/test-timeline.vcproj b/build/msvc_2k5/test-timeline.vcproj
new file mode 100644
index 000000000..c75ad95c6
--- /dev/null
+++ b/build/msvc_2k5/test-timeline.vcproj
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test-timeline"
+	ProjectGUID="{62835DE2-B950-4049-A947-5DB6080E7396}"
+	RootNamespace="testtimeline"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter_d.lib glib-2.0.lib sdl.lib pango-1.0.lib pangoft2-1.0.lib freetype.lib glee.lib gdk_pixbuf-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\.."
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="clutter.lib glib-2.0.lib gobject-2.0.lib"
+				AdditionalLibraryDirectories="$(TargetDir)"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\tests\test-timeline.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/msvc_2k5/version.rc b/build/msvc_2k5/version.rc
new file mode 100644
index 000000000..2df42c474
--- /dev/null
+++ b/build/msvc_2k5/version.rc
@@ -0,0 +1,48 @@
+#include <WinVer.h>
+#include "clutter-version.h"
+
+#define VER_FILEVERSION CLUTTER_MAJOR_VERSION,CLUTTER_MINOR_VERSION,CLUTTER_MICRO_VERSION,0
+#define VER_FILEVERSION_STR CLUTTER_VERSION_S"\0"
+#define VER_FILEDESCRIPTION_STR "Clutter runtime, http://clutter-project.org\0"
+
+#define VER_PRODUCTVERSION CLUTTER_MAJOR_VERSION,CLUTTER_MINOR_VERSION,CLUTTER_MICRO_VERSION,0
+#define VER_PRODUCTVERSION_STR CLUTTER_VERSION_S"\0"
+#define VER_PRODUCTNAME_STR "http://clutter-project.org\0"
+
+#define VER_COMPANYNAME_STR "Opened Hand Ltd\0"
+#define VER_COPYRIGHT_STR "Opened Hand Ltd\0"
+
+#ifndef DEBUG
+#define VER_DEBUG 0
+#else
+#define VER_DEBUG VS_FF_DEBUG
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION VER_FILEVERSION
+PRODUCTVERSION VER_PRODUCTVERSION
+FILEFLAGSMASK (VER_DEBUG)
+FILEFLAGS (VER_DEBUG)
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904e4"
+		BEGIN
+			VALUE "CompanyName",     VER_COMPANYNAME_STR
+			VALUE "FileDescription", VER_FILEDESCRIPTION_STR
+			VALUE "FileVersion",     VER_FILEVERSION_STR
+			VALUE "LegalCopyright",  VER_COPYRIGHT_STR
+			VALUE "ProductName",     VER_PRODUCTNAME_STR
+			VALUE "ProductVersion",  VER_PRODUCTVERSION_STR
+		END
+	END
+
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x409, 1252
+	END
+END
+ 
\ No newline at end of file