MSVC 2008 Builds: Split Up the Property Sheets

Split up the property sheets, so that it is easier to maintain, and update the project files accordingly. Also clean up the project files by finishing up the merge of the *_sdl.vcproj items into their regular counterparts, and dropping all the *_sdl.* files. Make use of UNIX line endings for all the MSVC 2008 build files, except the .sln file and the README.txt files, for easier maintenance.
2024-09-20 06:25:51 -04:00 · 2014-03-03 15:18:54 +08:00 · 2014-03-03 15:18:54 +08:00 · 4b40a8fe83
commit 4b40a8fe83
parent ab16d26e8f
18 changed files with 1051 additions and 1209 deletions
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@ -1,7 +1,9 @@
 EXTRA_DIST = \
 	cogl.sln		\
-	cogl_sdl.sln		\
-	cogl.vsprops	\
+	cogl-version-paths.vsprops	\
+	cogl-build-defines.vsprops	\
+	cogl-gen-srcs.vsprops	\
+	cogl-install.vsprops	\
 	cogl.vcproj		\
 	cogl.vcprojin		\
 	cogl-path.vcproj	\
--- a/build/win32/vs9/cogl-build-defines.vsprops
+++ b/build/win32/vs9/cogl-build-defines.vsprops
@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="coglbuilddefinesprops"
+	OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
+	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
+	InheritedPropertySheets=".\cogl-version-paths.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		AdditionalIncludeDirectories="..\..\..;..\..\..\cogl;..\..\..\cogl\winsys;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include"
+		PreprocessorDefinitions="G_DISABLE_SINGLE_INCLUDES"
+		ForcedIncludeFiles="msvc_recommended_pragmas.h"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
+	/>
+	<UserMacro
+		Name="BaseBuildDefines"
+		Value="_WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG"
+	/>
+	<UserMacro
+		Name="LibBuildDefines"
+		Value="HAVE_CONFIG_H;COGL_COMPILATION;$(BaseBuildDefines)"
+	/>
+	<UserMacro
+		Name="ReleaseLibBuildDefines"
+		Value="$(LibBuildDefines);G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS"
+	/>
+	<UserMacro
+		Name="DebugLibBuildDefines"
+		Value="_DEBUG;$(LibBuildDefines);COGL_GL_DEBUG;COGL_OBJECT_DEBUG;COGL_HANDLE_DEBUG"
+	/>
+	<UserMacro
+		Name="CoglBuildDefines"
+		Value="G_LOG_DOMAIN=\&quot;Cogl\&quot;;COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME=\&quot;\&quot;;COGL_LOCALEDIR=\&quot;/some/random/dir\&quot;"
+	/>
+	<UserMacro
+		Name="CoglPathBuildDefines"
+		Value="G_LOG_DOMAIN=\&quot;CoglPath\&quot;"
+	/>
+	<UserMacro
+		Name="CoglPangoBuildDefines"
+		Value="G_LOG_DOMAIN=\&quot;Cogl-Pango\&quot;"
+	/>
+</VisualStudioPropertySheet>
--- a/build/win32/vs9/cogl-crate.vcproj
+++ b/build/win32/vs9/cogl-crate.vcproj
@ -22,7 +22,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@ -51,7 +51,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@ -83,7 +83,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
@ -115,7 +115,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
--- a/build/win32/vs9/cogl-gen-srcs.vsprops
+++ b/build/win32/vs9/cogl-gen-srcs.vsprops
@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="coglgensrcsprops"
+	InheritedPropertySheets=".\cogl-build-defines.vsprops"
+	>
+	<UserMacro
+		Name="CopyDefinesSDLH"
+		Value="
+if exist ..\..\..\cogl\SDL_DEFINES goto DONE_COGL_DEFINES_H&#x0D;&#x0A;
+if not exist ..\..\..\cogl\WGL_DEFINES goto DO_COGL_DEFINES_H&#x0D;&#x0A;
+del ..\..\..\cogl\cogl-defines.h&#x0D;&#x0A;
+del ..\..\..\cogl\WGL_DEFINES&#x0D;&#x0A;
+:DO_COGL_DEFINES_H&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-defines.h.win32_sdl ..\..\..\cogl\SDL_DEFINES&#x0D;&#x0A;
+copy ..\..\..\cogl\SDL_DEFINES ..\..\..\cogl\cogl-defines.h&#x0D;&#x0A;
+:DONE_COGL_DEFINES_H&#x0D;&#x0A;
+"
+	/>
+	<UserMacro
+		Name="CopyDefinesH"
+		Value="
+if exist ..\..\..\cogl\WGL_DEFINES goto DONE_COGL_DEFINES_H&#x0D;&#x0A;
+if not exist ..\..\..\cogl\SDL_DEFINES goto DO_COGL_DEFINES_H&#x0D;&#x0A;
+del ..\..\..\cogl\cogl-defines.h&#x0D;&#x0A;
+del ..\..\..\cogl\SDL_DEFINES&#x0D;&#x0A;
+:DO_COGL_DEFINES_H&#x0D;&#x0A;
+copy ..\..\..\cogl\cogl-defines.h.win32 ..\..\..\cogl\WGL_DEFINES&#x0D;&#x0A;
+copy ..\..\..\cogl\WGL_DEFINES ..\..\..\cogl\cogl-defines.h&#x0D;&#x0A;
+:DONE_COGL_DEFINES_H&#x0D;&#x0A;
+"
+	/>
+	<UserMacro
+		Name="CopyConfigH"
+		Value="copy ..\..\..\config.h.win32 ..\..\..\config.h"
+	/>
+	<UserMacro
+		Name="CopyGLHeaderH"
+		Value="copy ..\..\..\cogl\cogl-gl-header.h.win32 ..\..\..\cogl\cogl-gl-header.h"
+	/>
+	<UserMacro
+		Name="GenCoglPathEnumsH"
+		Value="
+cd ..\..\..\cogl-path&#x0D;&#x0A;
+perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-path-enum-types.h.in cogl-path-types.h cogl1-path-functions.h &gt; cogl-path-enum-types.h&#x0D;&#x0A;
+cd $(SolutionDir)&#x0D;&#x0A;
+		      "
+	/>
+	<UserMacro
+		Name="GenCoglPathEnumsC"
+		Value="
+cd ..\..\..\cogl-path&#x0D;&#x0A;
+perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-path-enum-types.c.in cogl-path-types.h cogl1-path-functions.h &gt; cogl-path-enum-types.c&#x0D;&#x0A;
+cd $(SolutionDir)&#x0D;&#x0A;
+		      "
+	/>
+	<UserMacro
+		Name="GenCoglEnumsH"
+		Value="
+cd ..\..\..\cogl&#x0D;&#x0A;
+perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.h.in deprecated\cogl-clip-state.h deprecated\cogl-fixed.h deprecated\cogl-material-compat.h deprecated\cogl-vertex-buffer.h deprecated\cogl-shader.h deprecated\cogl-clutter.h deprecated\cogl-type-casts.h deprecated\cogl-framebuffer-deprecated.h deprecated\cogl-texture-deprecated.h deprecated\cogl-auto-texture.h cogl1-context.h cogl-bitmap.h cogl-color.h cogl-matrix.h cogl-offscreen.h cogl-primitives.h cogl-texture.h cogl-types.h cogl.h cogl-win32-renderer.h &gt; cogl-enum-types.h&#x0D;&#x0A;
+cd $(SolutionDir)&#x0D;&#x0A;
+		      "
+	/>
+	<UserMacro
+		Name="GenCoglEnumsC"
+		Value="
+cd ..\..\..\cogl&#x0D;&#x0A;
+perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.c.in deprecated\cogl-clip-state.h deprecated\cogl-fixed.h deprecated\cogl-material-compat.h deprecated\cogl-vertex-buffer.h deprecated\cogl-shader.h deprecated\cogl-clutter.h deprecated\cogl-type-casts.h deprecated\cogl-framebuffer-deprecated.h deprecated\cogl-texture-deprecated.h deprecated\cogl-auto-texture.h cogl1-context.h cogl-bitmap.h cogl-color.h cogl-matrix.h cogl-offscreen.h cogl-primitives.h cogl-texture.h cogl-types.h cogl.h cogl-win32-renderer.h &gt; cogl-enum-types.c&#x0D;&#x0A;
+cd $(SolutionDir)&#x0D;&#x0A;
+		      "
+	/>
+	<UserMacro
+		Name="GenerateCoglDef"
+		Value="
+echo EXPORTS &gt; $(DefDir)\cogl.def&#x0D;&#x0A;
+cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols &gt;&gt; $(DefDir)\cogl.def&#x0D;&#x0A;
+			  "
+	/>
+	<UserMacro
+		Name="GenerateCoglSDLDef"
+		Value="
+echo EXPORTS &gt; $(DefDir)\cogl.def&#x0D;&#x0A;
+cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols &gt;&gt; $(DefDir)\cogl.def&#x0D;&#x0A;
+			  "
+	/>
+	<UserMacro
+		Name="GenerateCoglPathDef"
+		Value="
+echo EXPORTS &gt; $(DefDir)\cogl-path.def&#x0D;&#x0A;
+cl -EP ..\..\..\cogl-path\cogl-path.symbols &gt;&gt; $(DefDir)\cogl-path.def&#x0D;&#x0A;
+			  "
+	/>
+	<UserMacro
+		Name="GenerateCoglPangoDef"
+		Value="
+echo EXPORTS &gt; $(DefDir)\cogl-pango.def&#x0D;&#x0A;
+cl -EP ..\..\..\cogl-pango\cogl-pango.symbols &gt;&gt; $(DefDir)\cogl-pango.def&#x0D;&#x0A;
+			  "
+	/>
+</VisualStudioPropertySheet>
--- a/build/win32/vs9/cogl-hello.vcproj
+++ b/build/win32/vs9/cogl-hello.vcproj
@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@ -50,7 +50,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@ -80,7 +80,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@ -112,7 +112,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
--- a/build/win32/vs9/cogl-info.vcproj
+++ b/build/win32/vs9/cogl-info.vcproj
@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@ -50,7 +50,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@ -80,7 +80,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@ -112,7 +112,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
--- a/build/win32/vs9/cogl-install.vsprops
+++ b/build/win32/vs9/cogl-install.vsprops
@ -2,139 +2,9 @@
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="coglprops"
-	OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
-	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
+	Name="coglinstallprops"
+	InheritedPropertySheets=".\cogl-build-defines.vsprops"
 	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\..;..\..\..\cogl;..\..\..\cogl\winsys;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include"
-		PreprocessorDefinitions="G_DISABLE_SINGLE_INCLUDES"
-		ForcedIncludeFiles="msvc_recommended_pragmas.h"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
-		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
-	/>
-	<UserMacro
-		Name="VSVer"
-		Value="9"
-	/>
-	<UserMacro
-		Name="GlibEtcInstallRoot"
-		Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="GlibEtcInstallRootFromBuildWin32"
-		Value="..\..\..\vs$(VSVer)\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="CopyDir"
-		Value="$(GlibEtcInstallRoot)"
-	/>
-	<UserMacro
-		Name="DefDir"
-		Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
-	/>
-	<UserMacro
-		Name="ApiVersion"
-		Value="1.0"
-	/>
-	<UserMacro
-		Name="BaseBuildDefines"
-		Value="_WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG"
-	/>
-	<UserMacro
-		Name="LibBuildDefines"
-		Value="HAVE_CONFIG_H;COGL_COMPILATION;$(BaseBuildDefines)"
-	/>
-	<UserMacro
-		Name="ReleaseLibBuildDefines"
-		Value="$(LibBuildDefines);G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS"
-	/>
-	<UserMacro
-		Name="DebugLibBuildDefines"
-		Value="_DEBUG;$(LibBuildDefines);COGL_GL_DEBUG;COGL_OBJECT_DEBUG;COGL_HANDLE_DEBUG"
-	/>
-	<UserMacro
-		Name="CoglBuildDefines"
-		Value="G_LOG_DOMAIN=\&quot;Cogl\&quot;;COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME=\&quot;\&quot;;COGL_LOCALEDIR=\&quot;/some/random/dir\&quot;"
-	/>
-	<UserMacro
-		Name="CoglPathBuildDefines"
-		Value="G_LOG_DOMAIN=\&quot;CoglPath\&quot;"
-	/>
-	<UserMacro
-		Name="CoglPangoBuildDefines"
-		Value="G_LOG_DOMAIN=\&quot;Cogl-Pango\&quot;"
-	/>
-	<UserMacro
-		Name="CopyDefinesSDLH"
-		Value="
-if exist ..\..\..\cogl\SDL_DEFINES goto DONE_COGL_DEFINES_H&#x0D;&#x0A;
-if not exist ..\..\..\cogl\WGL_DEFINES goto DO_COGL_DEFINES_H&#x0D;&#x0A;
-del ..\..\..\cogl\cogl-defines.h&#x0D;&#x0A;
-del ..\..\..\cogl\WGL_DEFINES&#x0D;&#x0A;
-:DO_COGL_DEFINES_H&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-defines.h.win32_sdl ..\..\..\cogl\SDL_DEFINES&#x0D;&#x0A;
-copy ..\..\..\cogl\SDL_DEFINES ..\..\..\cogl\cogl-defines.h&#x0D;&#x0A;
-:DONE_COGL_DEFINES_H&#x0D;&#x0A;
-"
-	/>
-	<UserMacro
-		Name="CopyDefinesH"
-		Value="
-if exist ..\..\..\cogl\WGL_DEFINES goto DONE_COGL_DEFINES_H&#x0D;&#x0A;
-if not exist ..\..\..\cogl\SDL_DEFINES goto DO_COGL_DEFINES_H&#x0D;&#x0A;
-del ..\..\..\cogl\cogl-defines.h&#x0D;&#x0A;
-del ..\..\..\cogl\SDL_DEFINES&#x0D;&#x0A;
-:DO_COGL_DEFINES_H&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-defines.h.win32 ..\..\..\cogl\WGL_DEFINES&#x0D;&#x0A;
-copy ..\..\..\cogl\WGL_DEFINES ..\..\..\cogl\cogl-defines.h&#x0D;&#x0A;
-:DONE_COGL_DEFINES_H&#x0D;&#x0A;
-"
-	/>
-	<UserMacro
-		Name="CopyConfigH"
-		Value="copy ..\..\..\config.h.win32 ..\..\..\config.h"
-	/>
-	<UserMacro
-		Name="CopyGLHeaderH"
-		Value="copy ..\..\..\cogl\cogl-gl-header.h.win32 ..\..\..\cogl\cogl-gl-header.h"
-	/>
-	<UserMacro
-		Name="GenCoglPathEnumsH"
-		Value="
-cd ..\..\..\cogl-path&#x0D;&#x0A;
-perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-path-enum-types.h.in cogl-path-types.h cogl1-path-functions.h &gt; cogl-path-enum-types.h&#x0D;&#x0A;
-cd $(SolutionDir)&#x0D;&#x0A;
-		      "
-	/>
-	<UserMacro
-		Name="GenCoglPathEnumsC"
-		Value="
-cd ..\..\..\cogl-path&#x0D;&#x0A;
-perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-path-enum-types.c.in cogl-path-types.h cogl1-path-functions.h &gt; cogl-path-enum-types.c&#x0D;&#x0A;
-cd $(SolutionDir)&#x0D;&#x0A;
-		      "
-	/>
-	<UserMacro
-		Name="GenCoglEnumsH"
-		Value="
-cd ..\..\..\cogl&#x0D;&#x0A;
-perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.h.in deprecated\cogl-clip-state.h deprecated\cogl-fixed.h deprecated\cogl-material-compat.h deprecated\cogl-vertex-buffer.h deprecated\cogl-shader.h deprecated\cogl-clutter.h deprecated\cogl-type-casts.h deprecated\cogl-framebuffer-deprecated.h deprecated\cogl-texture-deprecated.h deprecated\cogl-auto-texture.h cogl1-context.h cogl-bitmap.h cogl-color.h cogl-matrix.h cogl-offscreen.h cogl-primitives.h cogl-texture.h cogl-types.h cogl.h cogl-win32-renderer.h &gt; cogl-enum-types.h&#x0D;&#x0A;
-cd $(SolutionDir)&#x0D;&#x0A;
-		      "
-	/>
-	<UserMacro
-		Name="GenCoglEnumsC"
-		Value="
-cd ..\..\..\cogl&#x0D;&#x0A;
-perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.c.in deprecated\cogl-clip-state.h deprecated\cogl-fixed.h deprecated\cogl-material-compat.h deprecated\cogl-vertex-buffer.h deprecated\cogl-shader.h deprecated\cogl-clutter.h deprecated\cogl-type-casts.h deprecated\cogl-framebuffer-deprecated.h deprecated\cogl-texture-deprecated.h deprecated\cogl-auto-texture.h cogl1-context.h cogl-bitmap.h cogl-color.h cogl-matrix.h cogl-offscreen.h cogl-primitives.h cogl-texture.h cogl-types.h cogl.h cogl-win32-renderer.h &gt; cogl-enum-types.c&#x0D;&#x0A;
-cd $(SolutionDir)&#x0D;&#x0A;
-		      "
-	/>
 	<UserMacro
 		Name="CoglDoInstall"
 		Value="
@ -220,7 +90,6 @@ copy ..\..\..\cogl\deprecated\cogl-framebuffer-deprecated.h $(CopyDir)\include\c
 copy ..\..\..\cogl\deprecated\cogl-texture-deprecated.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl\deprecated&#x0D;&#x0A;
 copy ..\..\..\cogl\deprecated\cogl-auto-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl\deprecated&#x0D;&#x0A;

-
 mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl-pango&#x0D;&#x0A;
 copy ..\..\..\cogl-pango\cogl-pango.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-pango&#x0D;&#x0A;

@ -241,71 +110,4 @@ copy ..\..\..\tests\data\valgrind.suppressions $(CopyDir)\share\cogl-$(ApiVersio
 copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
 			  "
 	/>
-	<UserMacro
-		Name="DoGenGir"
-		Value="
-set VSVER=$(VSVer)&#x0D;&#x0A;
-set CONF=$(ConfigurationName)&#x0D;&#x0A;
-set PLAT=$(PlatformName)&#x0D;&#x0A;
-set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)&#x0D;&#x0A;
-
-cd ..&#x0D;&#x0A;
-call gengir_cogl.bat&#x0D;&#x0A;
-cd vs$(VSVer)&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="GenerateCoglDef"
-		Value="
-echo EXPORTS &gt; $(DefDir)\cogl.def&#x0D;&#x0A;
-cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols &gt;&gt; $(DefDir)\cogl.def&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="GenerateCoglSDLDef"
-		Value="
-echo EXPORTS &gt; $(DefDir)\cogl.def&#x0D;&#x0A;
-cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols &gt;&gt; $(DefDir)\cogl.def&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="GenerateCoglPathDef"
-		Value="
-echo EXPORTS &gt; $(DefDir)\cogl-path.def&#x0D;&#x0A;
-cl -EP ..\..\..\cogl-path\cogl-path.symbols &gt;&gt; $(DefDir)\cogl-path.def&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="GenerateCoglPangoDef"
-		Value="
-echo EXPORTS &gt; $(DefDir)\cogl-pango.def&#x0D;&#x0A;
-cl -EP ..\..\..\cogl-pango\cogl-pango.symbols &gt;&gt; $(DefDir)\cogl-pango.def&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="CoglLibtoolCompatibleDllPrefix"
-		Value="lib"
-	/>
-	<UserMacro
-		Name="CoglLibtoolCompatibleDllSuffix"
-		Value="-$(ApiVersion)-0"
-	/>
-	<UserMacro
-		Name="CoglSeparateVSDllPrefix"
-		Value=""
-	/>
-	<UserMacro
-		Name="CoglSeparateVSDllSuffix"
-		Value="-1-vs$(VSVER)"
-	/>
-	<!-- Change these two to GlibLibtoolCompatibleDllPrefix and
-	GlibLibtoolCompatibleDllSuffix if that is what you want -->
-	<UserMacro
-		Name="CoglDllPrefix"
-		Value="$(CoglSeparateVSDllPrefix)"
-	/>
-	<UserMacro
-		Name="CoglDllSuffix"
-		Value="$(CoglSeparateVSDllSuffix)"
-	/>
 </VisualStudioPropertySheet>
--- a/build/win32/vs9/cogl-msaa.vcproj
+++ b/build/win32/vs9/cogl-msaa.vcproj
@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@ -50,7 +50,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@ -80,7 +80,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@ -112,7 +112,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
--- a/build/win32/vs9/cogl-pango.vcprojin
+++ b/build/win32/vs9/cogl-pango.vcprojin
@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@ -54,7 +54,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@ -87,7 +87,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@ -123,7 +123,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
--- a/build/win32/vs9/cogl-path.vcprojin
+++ b/build/win32/vs9/cogl-path.vcprojin
@ -19,7 +19,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@ -53,7 +53,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@ -87,7 +87,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@ -124,7 +124,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
--- a/build/win32/vs9/cogl-sdl2-hello.vcproj
+++ b/build/win32/vs9/cogl-sdl2-hello.vcproj
@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@ -51,7 +51,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@ -82,7 +82,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@ -115,7 +115,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
--- a/build/win32/vs9/cogl-version-paths.vsprops
+++ b/build/win32/vs9/cogl-version-paths.vsprops
@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="coglversionpathsprops"
+	>
+	<UserMacro
+		Name="VSVer"
+		Value="9"
+	/>
+	<UserMacro
+		Name="GlibEtcInstallRoot"
+		Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
+	/>
+	<UserMacro
+		Name="CopyDir"
+		Value="$(GlibEtcInstallRoot)"
+	/>
+	<UserMacro
+		Name="DefDir"
+		Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
+	/>
+	<UserMacro
+		Name="ApiVersion"
+		Value="1.0"
+	/>
+	<UserMacro
+		Name="CoglLibtoolCompatibleDllPrefix"
+		Value="lib"
+	/>
+	<UserMacro
+		Name="CoglLibtoolCompatibleDllSuffix"
+		Value="-$(ApiVersion)-0"
+	/>
+	<UserMacro
+		Name="CoglSeparateVSDllPrefix"
+		Value=""
+	/>
+	<UserMacro
+		Name="CoglSeparateVSDllSuffix"
+		Value="-1-vs$(VSVER)"
+	/>
+	<!-- Change these two to CoglLibtoolCompatibleDllPrefix and
+	CoglLibtoolCompatibleDllSuffix if that is what you want -->
+	<UserMacro
+		Name="CoglDllPrefix"
+		Value="$(CoglSeparateVSDllPrefix)"
+	/>
+	<UserMacro
+		Name="CoglDllSuffix"
+		Value="$(CoglSeparateVSDllSuffix)"
+	/>
+</VisualStudioPropertySheet>
--- a/build/win32/vs9/cogl.sln
+++ b/build/win32/vs9/cogl.sln
@ -192,14 +192,14 @@ Global
 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.Build.0 = Release|Win32
 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.ActiveCfg = Release|x64
 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.Build.0 = Release|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_SDL|Win32.ActiveCfg = Debug|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_SDL|Win32.Build.0 = Debug|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_SDL|x64.ActiveCfg = Debug|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_SDL|x64.Build.0 = Debug|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_SDL|Win32.ActiveCfg = Release|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_SDL|Win32.Build.0 = Release|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_SDL|x64.ActiveCfg = Release|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_SDL|x64.Build.0 = Release|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_SDL|Win32.ActiveCfg = Debug_SDL|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_SDL|Win32.Build.0 = Debug_SDL|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_SDL|x64.ActiveCfg = Debug_SDL|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_SDL|x64.Build.0 = Debug_SDL|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_SDL|Win32.ActiveCfg = Release_SDL|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_SDL|Win32.Build.0 = Release_SDL|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_SDL|x64.ActiveCfg = Release_SDL|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_SDL|x64.Build.0 = Release_SDL|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/build/win32/vs9/cogl.vcprojin
+++ b/build/win32/vs9/cogl.vcprojin
@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@ -55,7 +55,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug_SDL|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-gen-srcs.vsprops"
 			OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
 			ConfigurationType="2"
 			CharacterSet="2"
@ -90,7 +90,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@ -124,7 +124,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug_SDL|x64"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-gen-srcs.vsprops"
 			OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
 			ConfigurationType="2"
 			CharacterSet="2"
@ -159,7 +159,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@ -196,7 +196,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release_SDL|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-gen-srcs.vsprops"
 			OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
 			ConfigurationType="2"
 			CharacterSet="2"
@ -234,7 +234,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@ -267,7 +267,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release_SDL|x64"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-gen-srcs.vsprops"
 			OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
 			ConfigurationType="2"
 			CharacterSet="2"
--- a/build/win32/vs9/cogl_sdl.sln
+++ b/build/win32/vs9/cogl_sdl.sln
@ -1,138 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-path", "cogl-path.vcproj", "{F3A80987-5411-43DB-A23B-06F2076E1207}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl", "cogl.vcproj", "{F3A80987-5411-43DB-A23B-06F2076E1206}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F3A80987-5411-43DB-A23B-06F2076E1207} = {F3A80987-5411-43DB-A23B-06F2076E1207}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-pango", "cogl-pango.vcproj", "{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-hello", "cogl-hello.vcproj", "{F5A43C12-7032-428E-A56A-D294075FA493}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-sdl-hello", "cogl-sdl-hello.vcproj", "{0B5D144D-1872-42CD-8437-FFDCDD08C03E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-crate", "cogl-crate.vcproj", "{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206}
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-info", "cogl-info.vcproj", "{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance-cogl", "test-conformance-cogl.vcproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206}
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install_sdl", "install_sdl.vcproj", "{35B2A4AC-7235-4FC7-995D-469D59195041}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}
-		{F5A43C12-7032-428E-A56A-D294075FA493} = {F5A43C12-7032-428E-A56A-D294075FA493}
-		{0B5D144D-1872-42CD-8437-FFDCDD08C03E} = {0B5D144D-1872-42CD-8437-FFDCDD08C03E}
-		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3} = {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}
-		{F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206}
-		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF} = {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE} = {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|Win32.ActiveCfg = Debug_SDL|Win32
-		{F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|Win32.Build.0 = Debug_SDL|Win32
-		{F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|x64.ActiveCfg = Debug_SDL|x64
-		{F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|x64.Build.0 = Debug_SDL|x64
-		{F3A80987-5411-43DB-A23B-06F2076E1207}.Release|Win32.ActiveCfg = Release_SDL|Win32
-		{F3A80987-5411-43DB-A23B-06F2076E1207}.Release|Win32.Build.0 = Release_SDL|Win32
-		{F3A80987-5411-43DB-A23B-06F2076E1207}.Release|x64.ActiveCfg = Release_SDL|x64
-		{F3A80987-5411-43DB-A23B-06F2076E1207}.Release|x64.Build.0 = Release_SDL|x64
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|Win32.ActiveCfg = Debug_SDL|Win32
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|Win32.Build.0 = Debug_SDL|Win32
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|x64.ActiveCfg = Debug_SDL|x64
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|x64.Build.0 = Debug_SDL|x64
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Release|Win32.ActiveCfg = Release_SDL|Win32
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Release|Win32.Build.0 = Release_SDL|Win32
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Release|x64.ActiveCfg = Release_SDL|x64
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Release|x64.Build.0 = Release_SDL|x64
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|Win32.Build.0 = Debug|Win32
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|x64.ActiveCfg = Debug|x64
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|x64.Build.0 = Debug|x64
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|Win32.ActiveCfg = Release|Win32
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|Win32.Build.0 = Release|Win32
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|x64.ActiveCfg = Release|x64
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|x64.Build.0 = Release|x64
-		{F5A43C12-7032-428E-A56A-D294075FA493}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F5A43C12-7032-428E-A56A-D294075FA493}.Debug|Win32.Build.0 = Debug|Win32
-		{F5A43C12-7032-428E-A56A-D294075FA493}.Debug|x64.ActiveCfg = Debug|x64
-		{F5A43C12-7032-428E-A56A-D294075FA493}.Debug|x64.Build.0 = Debug|x64
-		{F5A43C12-7032-428E-A56A-D294075FA493}.Release|Win32.ActiveCfg = Release|Win32
-		{F5A43C12-7032-428E-A56A-D294075FA493}.Release|Win32.Build.0 = Release|Win32
-		{F5A43C12-7032-428E-A56A-D294075FA493}.Release|x64.ActiveCfg = Release|x64
-		{F5A43C12-7032-428E-A56A-D294075FA493}.Release|x64.Build.0 = Release|x64
-		{0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug|Win32.Build.0 = Debug|Win32
-		{0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug|x64.ActiveCfg = Debug|x64
-		{0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug|x64.Build.0 = Debug|x64
-		{0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release|Win32.ActiveCfg = Release|Win32
-		{0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release|Win32.Build.0 = Release|Win32
-		{0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release|x64.ActiveCfg = Release|x64
-		{0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release|x64.Build.0 = Release|x64
-		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.Build.0 = Debug|Win32
-		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|x64.ActiveCfg = Debug|x64
-		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|x64.Build.0 = Debug|x64
-		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|Win32.ActiveCfg = Release|Win32
-		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|Win32.Build.0 = Release|Win32
-		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|x64.ActiveCfg = Release|x64
-		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|x64.Build.0 = Release|x64
-		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|Win32.Build.0 = Debug|Win32
-		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|x64.ActiveCfg = Debug|x64
-		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|x64.Build.0 = Debug|x64
-		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|Win32.ActiveCfg = Release|Win32
-		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|Win32.Build.0 = Release|Win32
-		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|x64.ActiveCfg = Release|x64
-		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|x64.Build.0 = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.Build.0 = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.ActiveCfg = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.Build.0 = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.ActiveCfg = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.Build.0 = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.ActiveCfg = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.Build.0 = Release|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.ActiveCfg = Debug|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.Build.0 = Debug|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.ActiveCfg = Debug|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.Build.0 = Debug|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.ActiveCfg = Release|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.Build.0 = Release|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.ActiveCfg = Release|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@ -20,7 +20,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-install.vsprops"
 			OutputDirectory="$(GlibEtcInstallRoot)"
 			ConfigurationType="10"
 			CharacterSet="2"
@ -30,9 +30,24 @@
 				CommandLine="$(CoglDoInstall)"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug_SDL|Win32"
+			InheritedPropertySheets=".\cogl-install.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="
+$(CoglDoInstall)
+$(CoglDoInstallSDL)
+				            "
+			/>
+		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-install.vsprops"
 			OutputDirectory="$(GlibEtcInstallRoot)"
 			ConfigurationType="10"
 			CharacterSet="2"
@ -43,9 +58,25 @@
 				CommandLine="$(CoglDoInstall)"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug_SDL|x64"
+			InheritedPropertySheets=".\cogl-install.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			DeleteExtensionsOnClean=""
+			>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="
+$(CoglDoInstall)
+$(CoglDoInstallSDL)
+				            "
+			/>
+		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-install.vsprops"
 			OutputDirectory="$(GlibEtcInstallRoot)"
 			ConfigurationType="10"
 			CharacterSet="2"
@ -56,9 +87,25 @@
 				CommandLine="$(CoglDoInstall)"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release_SDL|Win32"
+			InheritedPropertySheets=".\cogl-install.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="
+$(CoglDoInstall)
+$(CoglDoInstallSDL)
+				            "
+			/>
+		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-install.vsprops"
 			OutputDirectory="$(GlibEtcInstallRoot)"
 			ConfigurationType="10"
 			CharacterSet="2"
@ -70,6 +117,22 @@
 				CommandLine="$(CoglDoInstall)"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release_SDL|x64"
+			InheritedPropertySheets=".\cogl-install.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="
+$(CoglDoInstall)
+$(CoglDoInstallSDL)
+				            "
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
--- a/build/win32/vs9/install_sdl.vcproj
+++ b/build/win32/vs9/install_sdl.vcproj
@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="install"
-	ProjectGUID="{35B2A4AC-7235-4FC7-995D-469D59195041}"
-	RootNamespace="install_sdl"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="
-$(CoglDoInstall)
-$(CoglDoInstallSDL)
-				            "
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\cogl.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="
-$(CoglDoInstall)
-$(CoglDoInstallSDL)
-				            "
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="
-$(CoglDoInstall)
-$(CoglDoInstallSDL)
-				            "
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\cogl.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="
-$(CoglDoInstall)
-$(CoglDoInstallSDL)
-				            "
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/build/win32/vs9/test-conformance-cogl.vcprojin
+++ b/build/win32/vs9/test-conformance-cogl.vcprojin
@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@ -52,7 +52,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@ -84,7 +84,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@ -118,7 +118,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\cogl.vsprops"
+			InheritedPropertySheets=".\cogl-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>