[cogl/cogl-1.18] Update the Visual Studio 2010 Projects



commit 206ea0de6be706f39a4e04e2cde956576bc70628
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Mar 3 17:48:31 2014 +0800

    Update the Visual Studio 2010 Projects
    
    This updates the Visual Studio 2010 Projects in the following ways,
    similar to the recent changes to the Visual Studio 2008 projects:
    
    -Make all the copying of the pre-configured header files custom build
     rules, so that it is cleaner when people clean their builds, and the files
     can be re-copied when updated.
    -Split up the property sheets, so to ease future maintenance
    -Make the cogl-path library built as a DLL
    -Build and link against SDL-2.x for SDL builds
    -Make everything except the .sln file and the README.txt file use UNIX line
     endings, for easier maintenance.
    -Merge cogl_sdl.sln and install-sdl.vcxproj into cogl.sln and
     install.vcxproj respectively.
    -Update build of the conformance test to not use COGL_COMPILATION, and make
     it link to cogl-path.

 build/win32/vs10/Makefile.am                       |   11 +-
 build/win32/vs10/cogl-build-defines.props          |   55 ++
 build/win32/vs10/cogl-crate.vcxproj                |  344 ++++----
 build/win32/vs10/cogl-crate.vcxproj.filters        |   28 +-
 build/win32/vs10/cogl-gen-srcs.props               |  107 +++
 build/win32/vs10/cogl-hello.vcxproj                |  312 +++---
 build/win32/vs10/cogl-hello.vcxproj.filters        |   28 +-
 build/win32/vs10/cogl-info.vcxproj                 |  328 ++++----
 build/win32/vs10/cogl-info.vcxproj.filters         |   28 +-
 build/win32/vs10/cogl-install.props                |  216 +++++
 build/win32/vs10/cogl-msaa.vcxproj                 |  330 ++++----
 build/win32/vs10/cogl-msaa.vcxproj.filters         |   28 +-
 build/win32/vs10/cogl-pango.vcxproj.filtersin      |    2 +-
 build/win32/vs10/cogl-pango.vcxprojin              |  398 ++++----
 build/win32/vs10/cogl-path.vcxproj.filtersin       |    3 +-
 build/win32/vs10/cogl-path.vcxprojin               |  554 +++++-------
 ...l-sdl-hello.vcxproj => cogl-sdl2-hello.vcxproj} |   22 +-
 ...roj.filters => cogl-sdl2-hello.vcxproj.filters} |    2 +-
 build/win32/vs10/cogl-version-paths.props          |   53 +
 build/win32/vs10/cogl.props                        |  414 --------
 build/win32/vs10/cogl.sln                          |   98 ++-
 build/win32/vs10/cogl.vcxproj.filtersin            |    8 +-
 build/win32/vs10/cogl.vcxprojin                    | 1002 ++++++++++----------
 build/win32/vs10/cogl_sdl.sln                      |  106 --
 build/win32/vs10/install-sdl.vcxproj               |  137 ---
 build/win32/vs10/install.vcxproj                   |  338 +++++---
 .../vs10/test-conformance-cogl.vcxproj.filtersin   |    2 +-
 build/win32/vs10/test-conformance-cogl.vcxprojin   |   24 +-
 28 files changed, 2439 insertions(+), 2539 deletions(-)
---
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index b54bae6..390a3f1 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -1,7 +1,9 @@
 EXTRA_DIST = \
        cogl.sln                \
-       cogl_sdl.sln            \
-       cogl.props      \
+       cogl-version-paths.props        \
+       cogl-build-defines.props        \
+       cogl-gen-srcs.props     \
+       cogl-install.props      \
        cogl.vcxproj            \
        cogl.vcxprojin          \
        cogl.vcxproj.filters    \
@@ -16,8 +18,8 @@ EXTRA_DIST = \
        cogl-pango.vcxproj.filtersin    \
        cogl-hello.vcxproj      \
        cogl-hello.vcxproj.filters      \
-       cogl-sdl-hello.vcxproj  \
-       cogl-sdl-hello.vcxproj.filters  \
+       cogl-sdl2-hello.vcxproj \
+       cogl-sdl2-hello.vcxproj.filters \
        cogl-msaa.vcxproj       \
        cogl-msaa.vcxproj.filters       \
        cogl-info.vcxproj       \
@@ -29,5 +31,4 @@ EXTRA_DIST = \
        test-conformance-cogl.vcxproj.filters   \
        test-conformance-cogl.vcxproj.filtersin \
        install.vcxproj \
-       install-sdl.vcxproj     \
        README.txt
diff --git a/build/win32/vs10/cogl-build-defines.props b/build/win32/vs10/cogl-build-defines.props
new file mode 100644
index 0000000..27b2e4c
--- /dev/null
+++ b/build/win32/vs10/cogl-build-defines.props
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="cogl-version-paths.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <BaseBuildDefines>_WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG</BaseBuildDefines>
+    <LibBuildDefines>HAVE_CONFIG_H;COGL_COMPILATION;$(BaseBuildDefines)</LibBuildDefines>
+    
<ReleaseLibBuildDefines>$(LibBuildDefines);G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS</ReleaseLibBuildDefines>
+    
<DebugLibBuildDefines>_DEBUG;$(LibBuildDefines);COGL_GL_DEBUG;COGL_OBJECT_DEBUG;COGL_HANDLE_DEBUG</DebugLibBuildDefines>
+    
<CoglBuildDefines>G_LOG_DOMAIN="Cogl";COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME="";COGL_LOCALEDIR="/some/random/dir"</CoglBuildDefines>
+    <CoglPathBuildDefines>G_LOG_DOMAIN="CoglPath"</CoglPathBuildDefines>
+    <CoglPangoBuildDefines>G_LOG_DOMAIN="Cogl-Pango"</CoglPangoBuildDefines>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>coglbuilddefinesprops</_PropertySheetDisplayName>
+    <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      
<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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="BaseBuildDefines">
+      <Value>$(BaseBuildDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="LibBuildDefines">
+      <Value>$(LibBuildDefines)</Value>
+    </BuildMacro>
+       <BuildMacro Include="ReleaseLibBuildDefines">
+      <Value>$(ReleaseLibBuildDefines)</Value>
+    </BuildMacro>
+       <BuildMacro Include="DebugLibBuildDefines">
+      <Value>$(DebugLibBuildDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CoglBuildDefines">
+      <Value>$(CoglBuildDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CoglPathBuildDefines">
+      <Value>$(CoglPathBuildDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CoglPangoBuildDefines">
+      <Value>$(CoglPangoBuildDefines)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/cogl-crate.vcxproj b/build/win32/vs10/cogl-crate.vcxproj
index 5c80bad..8b5f6d6 100644
--- a/build/win32/vs10/cogl-crate.vcxproj
+++ b/build/win32/vs10/cogl-crate.vcxproj
@@ -1,172 +1,172 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}</ProjectGuid>
-    <RootNamespace>cogl-crate</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\examples\cogl-crate.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="cogl-pango.vcxproj">
-      <Project>{fe5abd0f-91e8-4aa5-9c1c-408427d5f768}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="cogl.vcxproj">
-      <Project>{f3a80987-5411-43db-a23b-06f2076e1206}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}</ProjectGuid>
+    <RootNamespace>cogl-crate</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\examples\cogl-crate.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="cogl-pango.vcxproj">
+      <Project>{fe5abd0f-91e8-4aa5-9c1c-408427d5f768}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="cogl.vcxproj">
+      <Project>{f3a80987-5411-43db-a23b-06f2076e1206}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/build/win32/vs10/cogl-crate.vcxproj.filters b/build/win32/vs10/cogl-crate.vcxproj.filters
index 512afe1..27b7062 100644
--- a/build/win32/vs10/cogl-crate.vcxproj.filters
+++ b/build/win32/vs10/cogl-crate.vcxproj.filters
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\examples\cogl-crate.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ItemGroup>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\examples\cogl-crate.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/cogl-gen-srcs.props b/build/win32/vs10/cogl-gen-srcs.props
new file mode 100644
index 0000000..b68b92c
--- /dev/null
+++ b/build/win32/vs10/cogl-gen-srcs.props
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="cogl-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <CopyDefinesSDLH>
+if exist ..\..\..\cogl\SDL_DEFINES goto DONE_COGL_DEFINES_H
+if not exist ..\..\..\cogl\WGL_DEFINES goto DO_COGL_DEFINES_H
+del ..\..\..\cogl\cogl-defines.h
+del ..\..\..\cogl\WGL_DEFINES
+:DO_COGL_DEFINES_H
+copy ..\..\..\cogl\cogl-defines.h.win32_sdl ..\..\..\cogl\SDL_DEFINES
+copy ..\..\..\cogl\SDL_DEFINES ..\..\..\cogl\cogl-defines.h
+:DONE_COGL_DEFINES_H
+    </CopyDefinesSDLH>
+    <CopyDefinesH>
+if exist ..\..\..\cogl\WGL_DEFINES goto DONE_COGL_DEFINES_H
+if not exist ..\..\..\cogl\SDL_DEFINES goto DO_COGL_DEFINES_H
+del ..\..\..\cogl\cogl-defines.h
+del ..\..\..\cogl\SDL_DEFINES
+:DO_COGL_DEFINES_H
+copy ..\..\..\cogl\cogl-defines.h.win32 ..\..\..\cogl\WGL_DEFINES
+copy ..\..\..\cogl\WGL_DEFINES ..\..\..\cogl\cogl-defines.h
+:DONE_COGL_DEFINES_H
+    </CopyDefinesH>
+    <CopyConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</CopyConfigH>
+    <CopyGLHeaderH>copy ..\..\..\cogl\cogl-gl-header.h.win32 ..\..\..\cogl\cogl-gl-header.h</CopyGLHeaderH>
+    <GenCoglPathEnumsH>
+cd ..\..\..\cogl-path
+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
+cd $(SolutionDir)
+    </GenCoglPathEnumsH>
+    <GenCoglPathEnumsC>
+cd ..\..\..\cogl-path
+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
+cd $(SolutionDir)
+    </GenCoglPathEnumsC>
+    <GenCoglEnumsH>
+cd ..\..\..\cogl
+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
+cd $(SolutionDir)
+    </GenCoglEnumsH>
+    <GenCoglEnumsC>
+cd ..\..\..\cogl
+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
+cd $(SolutionDir)
+    </GenCoglEnumsC>
+    <GenerateCoglDef>
+echo EXPORTS &gt; $(DefDir)\cogl.def
+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
+    </GenerateCoglDef>
+    <GenerateCoglSDLDef>
+echo EXPORTS &gt; $(DefDir)\cogl.def
+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
+    </GenerateCoglSDLDef>
+    <GenerateCoglPathDef>
+echo EXPORTS &gt; $(DefDir)\cogl-path.def
+cl -EP ..\..\..\cogl-path\cogl-path.symbols &gt;&gt; $(DefDir)\cogl-path.def
+     </GenerateCoglPathDef>
+    <GenerateCoglPangoDef>
+echo EXPORTS &gt; $(DefDir)\cogl-pango.def
+cl -EP ..\..\..\cogl-pango\cogl-pango.symbols &gt;&gt; $(DefDir)\cogl-pango.def
+     </GenerateCoglPangoDef>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>coglprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="CopyConfigH">
+      <Value>$(CopyConfigH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CopyGLHeaderH">
+      <Value>$(CopyGLHeaderH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CopyDefinesSDLH">
+      <Value>$(CopyDefinesSDLH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CopyDefinesH">
+      <Value>$(CopyDefinesH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenCoglPathEnumsH">
+      <Value>$(GenCoglPathEnumsH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenCoglPathEnumsC">
+      <Value>$(GenCoglPathEnumsC)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenCoglEnumsH">
+      <Value>$(GenCoglEnumsH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenCoglEnumsC">
+      <Value>$(GenCoglEnumsC)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenerateCoglDef">
+      <Value>$(GenerateCoglDef)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenerateCoglSDLDef">
+      <Value>$(GenerateCoglDef)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenerateCoglPathDef">
+      <Value>$(GenerateCoglPathDef)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenerateCoglPangoDef">
+      <Value>$(GenerateCoglPangoDef)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/cogl-hello.vcxproj b/build/win32/vs10/cogl-hello.vcxproj
index 6aa8771..7ef7e61 100644
--- a/build/win32/vs10/cogl-hello.vcxproj
+++ b/build/win32/vs10/cogl-hello.vcxproj
@@ -1,156 +1,156 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F5A43C12-7032-428E-A56A-D294075FA493}</ProjectGuid>
-    <RootNamespace>cogl-hello</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\examples\cogl-hello.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="cogl.vcxproj">
-      <Project>{f3a80987-5411-43db-a23b-06f2076e1206}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{F5A43C12-7032-428E-A56A-D294075FA493}</ProjectGuid>
+    <RootNamespace>cogl-hello</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\examples\cogl-hello.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="cogl.vcxproj">
+      <Project>{f3a80987-5411-43db-a23b-06f2076e1206}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/build/win32/vs10/cogl-hello.vcxproj.filters b/build/win32/vs10/cogl-hello.vcxproj.filters
index 84c9a46..26236c7 100644
--- a/build/win32/vs10/cogl-hello.vcxproj.filters
+++ b/build/win32/vs10/cogl-hello.vcxproj.filters
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\examples\cogl-hello.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ItemGroup>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\examples\cogl-hello.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/cogl-info.vcxproj b/build/win32/vs10/cogl-info.vcxproj
index 7aae8ea..8032316 100644
--- a/build/win32/vs10/cogl-info.vcxproj
+++ b/build/win32/vs10/cogl-info.vcxproj
@@ -1,164 +1,164 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}</ProjectGuid>
-    <RootNamespace>coglinfo</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\examples\cogl-info.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="cogl.vcxproj">
-      <Project>{f3a80987-5411-43db-a23b-06f2076e1206}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}</ProjectGuid>
+    <RootNamespace>coglinfo</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\examples\cogl-info.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="cogl.vcxproj">
+      <Project>{f3a80987-5411-43db-a23b-06f2076e1206}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/build/win32/vs10/cogl-info.vcxproj.filters b/build/win32/vs10/cogl-info.vcxproj.filters
index 225e706..c73fb10 100644
--- a/build/win32/vs10/cogl-info.vcxproj.filters
+++ b/build/win32/vs10/cogl-info.vcxproj.filters
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\examples\cogl-info.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ItemGroup>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\examples\cogl-info.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/cogl-install.props b/build/win32/vs10/cogl-install.props
new file mode 100644
index 0000000..dac2232
--- /dev/null
+++ b/build/win32/vs10/cogl-install.props
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="cogl-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <CoglDoInstallBin>
+mkdir $(CopyDir)\bin
+
+mkdir $(CopyDir)\lib
+
+
+if "$(Configuration)" == "Release_SDL" goto DO_REL_BIN
+
+if "$(Configuration)" == "Debug_SDL" goto DO_DBG_BIN
+
+
+copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin
+
+copy $(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
+
+copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin
+
+goto DONE_BIN
+
+
+:DO_REL_BIN
+
+copy Release\$(Platform)\bin\*.dll $(CopyDir)\bin
+
+copy Release\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
+
+copy Release\$(Platform)\bin\*.exe $(CopyDir)\bin
+
+goto DONE_BIN
+
+
+:DO_DBG_BIN
+
+copy Debug\$(Platform)\bin\*.dll $(CopyDir)\bin
+
+copy Debug\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
+
+copy Debug\$(Platform)\bin\*.exe $(CopyDir)\bin
+
+goto DONE_BIN
+
+:DONE_BIN
+    </CoglDoInstallBin>
+    <CoglDoInstall>
+$(CoglDoInstallBin)
+
+mkdir $(CopyDir)\share\cogl-$(ApiVersion)\examples-data
+
+copy ..\..\..\examples\*.jpg $(CopyDir)\share\cogl-$(ApiVersion)\examples-data
+
+
+mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-object.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-atlas-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-attribute-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-bitmap.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-color.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-deprecated.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-depth-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-error.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-euler.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-fence.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-fixed.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-frame-info.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-glib-source.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-macros.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-material-compat.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-pipeline.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-vector.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-matrix.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-matrix-stack.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-offscreen.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-onscreen.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-output.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-primitives.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-primitive-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-pipeline-layer-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-pipeline-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-pixel-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-poll.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-quaternion.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-shader.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-snippet.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-texture-2d.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-texture-2d-gl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-texture-2d-sliced.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-sub-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-texture-rectangle.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-meta-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-texture-3d.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-types.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-vertex-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-index-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-indices.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-attribute.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-primitive.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-clip-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-framebuffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-clutter.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-defines.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-enum-types.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-renderer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-swap-chain.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-onscreen-template.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-display.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-context.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-version.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-win32-renderer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl1-context.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl2-experimental.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+
+
+mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl-pango
+
+copy ..\..\..\cogl-pango\cogl-pango.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-pango
+
+
+mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl-path
+
+copy ..\..\..\cogl-path\cogl-path.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-path
+
+copy ..\..\..\cogl-path\cogl-path-types.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-path
+
+copy ..\..\..\cogl-path\cogl1-path-functions.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-path
+
+copy ..\..\..\cogl-path\cogl2-path-functions.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-path
+
+copy ..\..\..\cogl-path\cogl-path-enum-types.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-path
+    </CoglDoInstall>
+    <CoglDoInstallSDL>copy ..\..\..\cogl\cogl-sdl.h 
$(CopyDir)\include\cogl-$(ApiVersion)\cogl</CoglDoInstallSDL>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>coglinstallprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="CoglDoInstallBin">
+      <Value>$(CoglDoInstall)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CoglDoInstall">
+      <Value>$(CoglDoInstall)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CoglDoInstallSDL">
+      <Value>$(CoglDoInstallSDL)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/cogl-msaa.vcxproj b/build/win32/vs10/cogl-msaa.vcxproj
index 29ed46b..f63c784 100644
--- a/build/win32/vs10/cogl-msaa.vcxproj
+++ b/build/win32/vs10/cogl-msaa.vcxproj
@@ -1,165 +1,165 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{44E864D4-8447-484D-9B16-D5405E0783CF}</ProjectGuid>
-    <RootNamespace>coglmsaa</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\examples\cogl-msaa.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="cogl.vcxproj">
-      <Project>{f3a80987-5411-43db-a23b-06f2076e1206}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{44E864D4-8447-484D-9B16-D5405E0783CF}</ProjectGuid>
+    <RootNamespace>coglmsaa</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\examples\cogl-msaa.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="cogl.vcxproj">
+      <Project>{f3a80987-5411-43db-a23b-06f2076e1206}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/build/win32/vs10/cogl-msaa.vcxproj.filters b/build/win32/vs10/cogl-msaa.vcxproj.filters
index 94457e9..db51fe2 100644
--- a/build/win32/vs10/cogl-msaa.vcxproj.filters
+++ b/build/win32/vs10/cogl-msaa.vcxproj.filters
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\examples\cogl-msaa.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ItemGroup>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\examples\cogl-msaa.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/cogl-pango.vcxproj.filtersin b/build/win32/vs10/cogl-pango.vcxproj.filtersin
index 48d7d45..5f7ba5a 100644
--- a/build/win32/vs10/cogl-pango.vcxproj.filtersin
+++ b/build/win32/vs10/cogl-pango.vcxproj.filtersin
@@ -16,4 +16,4 @@
   <ItemGroup>
     <CustomBuild Include="..\..\..\cogl-pango\cogl-pango.symbols"><Filter>Resource 
Files</Filter></CustomBuild>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/cogl-pango.vcxprojin b/build/win32/vs10/cogl-pango.vcxprojin
index 9698c02..0988da7 100644
--- a/build/win32/vs10/cogl-pango.vcxprojin
+++ b/build/win32/vs10/cogl-pango.vcxprojin
@@ -1,202 +1,202 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
-       <ItemGroup Label="ProjectConfigurations">
-               <ProjectConfiguration Include="Debug|Win32">
-                       <Configuration>Debug</Configuration>
-                       <Platform>Win32</Platform>
-               </ProjectConfiguration>
-               <ProjectConfiguration Include="Debug|x64">
-                       <Configuration>Debug</Configuration>
-                       <Platform>x64</Platform>
-               </ProjectConfiguration>
-               <ProjectConfiguration Include="Release|Win32">
-                       <Configuration>Release</Configuration>
-                       <Platform>Win32</Platform>
-               </ProjectConfiguration>
-               <ProjectConfiguration Include="Release|x64">
-                       <Configuration>Release</Configuration>
-                       <Platform>x64</Platform>
-               </ProjectConfiguration>
-       </ItemGroup>
-       <PropertyGroup Label="Globals">
-               <ProjectGuid>{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}</ProjectGuid>
-               <RootNamespace>coglpango</RootNamespace>
-               <Keyword>Win32Proj</Keyword>
-       </PropertyGroup>
-       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-               <ConfigurationType>DynamicLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-               <WholeProgramOptimization>true</WholeProgramOptimization>
-       </PropertyGroup>
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-               <ConfigurationType>DynamicLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-       </PropertyGroup>
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-               <ConfigurationType>DynamicLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-       </PropertyGroup>
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-               <ConfigurationType>DynamicLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-       </PropertyGroup>
-       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-       <ImportGroup Label="ExtensionSettings">
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <PropertyGroup Label="UserMacros" />
-       <PropertyGroup>
-               <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-               <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-               <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-               <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
-       </PropertyGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-               <PreBuildEvent>
-                       <Command>$(PreBuildCmd)</Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       <Optimization>Disabled</Optimization>
-                       
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <MinimalRebuild>true</MinimalRebuild>
-                       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-                       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-               </ClCompile>
-               <Link>
-                       
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
-                       <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
-                       <ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
-                       <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-                       <GenerateDebugInformation>true</GenerateDebugInformation>
-                       <SubSystem>Windows</SubSystem>
-                       <TargetMachine>MachineX86</TargetMachine>
-               </Link>
-       </ItemDefinitionGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-               <PreBuildEvent>
-                       <Command>$(PreBuildCmd)</Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       <Optimization>Disabled</Optimization>
-                       
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <MinimalRebuild>true</MinimalRebuild>
-                       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-                       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-               </ClCompile>
-               <Link>
-                       
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
-                       <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
-                       <ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
-                       <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-                       <GenerateDebugInformation>true</GenerateDebugInformation>
-                       <SubSystem>Windows</SubSystem>
-                       <TargetMachine>MachineX64</TargetMachine>
-               </Link>
-       </ItemDefinitionGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-               <PreBuildEvent>
-                       <Command>$(PreBuildCmd)</Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       <Optimization>MaxSpeed</Optimization>
-                       <IntrinsicFunctions>true</IntrinsicFunctions>
-                       
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-                       <FunctionLevelLinking>true</FunctionLevelLinking>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-               </ClCompile>
-               <Link>
-                       
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
-                       <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
-                       <ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
-                       <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-                       <GenerateDebugInformation>true</GenerateDebugInformation>
-                       <SubSystem>Windows</SubSystem>
-                       <OptimizeReferences>true</OptimizeReferences>
-                       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-                       <TargetMachine>MachineX86</TargetMachine>
-               </Link>
-       </ItemDefinitionGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-               <PreBuildEvent>
-                       <Command>$(PreBuildCmd)</Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-               </ClCompile>
-               <Link>
-                       
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
-                       <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
-                       <ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
-                       <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-                       <GenerateDebugInformation>true</GenerateDebugInformation>
-                       <SubSystem>Windows</SubSystem>
-                       <OptimizeReferences>true</OptimizeReferences>
-                       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-                       <TargetMachine>MachineX64</TargetMachine>
-               </Link>
-       </ItemDefinitionGroup>
-       <ItemGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}</ProjectGuid>
+    <RootNamespace>coglpango</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-gen-srcs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PreBuildEvent>
+      <Command>$(PreBuildCmd)</Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PreBuildEvent>
+      <Command>$(PreBuildCmd)</Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PreBuildEvent>
+      <Command>$(PreBuildCmd)</Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PreBuildEvent>
+      <Command>$(PreBuildCmd)</Command>
+    </PreBuildEvent>
+    <ClCompile>
+      
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
 #include "coglpango.vs10.sourcefiles"
-       </ItemGroup>
-       <ItemGroup>
-               <CustomBuild Include="..\..\..\cogl-pango\cogl-pango.symbols">
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating 
$(IntDir)\cogl-pango.def</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateCoglPangoDef)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\cogl-pango.def;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating 
$(IntDir)\cogl-pango.def</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateCoglPangoDef)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\cogl-pango.def;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating 
$(IntDir)\cogl-pango.def</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateCoglPangoDef)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\cogl-pango.def;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating 
$(IntDir)\cogl-pango.def</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateCoglPangoDef)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\cogl-pango.def;%(Outputs)</Outputs>
-               </CustomBuild>
-       </ItemGroup>
-       <ItemGroup>
-               <ResourceCompile Include="..\..\..\cogl-pango\cogl-pango.rc" />
-       </ItemGroup>
-       <ItemGroup>
-               <ProjectReference Include="cogl.vcxproj">
-                       <Project>{f3a80987-5411-43db-a23b-06f2076e1206}</Project>
-                       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-               </ProjectReference>
-       </ItemGroup>
-       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-       <ImportGroup Label="ExtensionTargets">
-       </ImportGroup>
-</Project>
\ No newline at end of file
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\cogl-pango\cogl-pango.symbols">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating 
$(IntDir)\cogl-pango.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateCoglPangoDef)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\cogl-pango.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating 
$(IntDir)\cogl-pango.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateCoglPangoDef)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\cogl-pango.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating 
$(IntDir)\cogl-pango.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateCoglPangoDef)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\cogl-pango.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating 
$(IntDir)\cogl-pango.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateCoglPangoDef)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\cogl-pango.def;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\cogl-pango\cogl-pango.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="cogl.vcxproj">
+      <Project>{f3a80987-5411-43db-a23b-06f2076e1206}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/build/win32/vs10/cogl-path.vcxproj.filtersin b/build/win32/vs10/cogl-path.vcxproj.filtersin
index aa93b41..1c4a30f 100644
--- a/build/win32/vs10/cogl-path.vcxproj.filtersin
+++ b/build/win32/vs10/cogl-path.vcxproj.filtersin
@@ -18,7 +18,8 @@
     <ClCompile Include="..\..\..\cogl-path\cogl-path-enum-types.c"><Filter>Sources</Filter></ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <CustomBuild Include="..\..\..\cogl-path\cogl-path.symbols"><Filter>Resource Files</Filter></CustomBuild>
     <CustomBuild Include="..\..\..\cogl-path\cogl-path-enum-types.h.in"><Filter>Resource 
Files</Filter></CustomBuild>
     <CustomBuild Include="..\..\..\cogl-path\cogl-path-enum-types.c.in"><Filter>Resource 
Files</Filter></CustomBuild>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/cogl-path.vcxprojin b/build/win32/vs10/cogl-path.vcxprojin
index c6e7773..4a03e99 100644
--- a/build/win32/vs10/cogl-path.vcxprojin
+++ b/build/win32/vs10/cogl-path.vcxprojin
@@ -1,334 +1,226 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
-       <ItemGroup Label="ProjectConfigurations">
-               <ProjectConfiguration Include="Debug_SDL|Win32">
-                       <Configuration>Debug_SDL</Configuration>
-                       <Platform>Win32</Platform>
-               </ProjectConfiguration>
-               <ProjectConfiguration Include="Debug_SDL|x64">
-                       <Configuration>Debug_SDL</Configuration>
-                       <Platform>x64</Platform>
-               </ProjectConfiguration>
-               <ProjectConfiguration Include="Debug|Win32">
-                       <Configuration>Debug</Configuration>
-                       <Platform>Win32</Platform>
-               </ProjectConfiguration>
-               <ProjectConfiguration Include="Debug|x64">
-                       <Configuration>Debug</Configuration>
-                       <Platform>x64</Platform>
-               </ProjectConfiguration>
-               <ProjectConfiguration Include="Release_SDL|Win32">
-                       <Configuration>Release_SDL</Configuration>
-                       <Platform>Win32</Platform>
-               </ProjectConfiguration>
-               <ProjectConfiguration Include="Release_SDL|x64">
-                       <Configuration>Release_SDL</Configuration>
-                       <Platform>x64</Platform>
-               </ProjectConfiguration>
-               <ProjectConfiguration Include="Release|Win32">
-                       <Configuration>Release</Configuration>
-                       <Platform>Win32</Platform>
-               </ProjectConfiguration>
-               <ProjectConfiguration Include="Release|x64">
-                       <Configuration>Release</Configuration>
-                       <Platform>x64</Platform>
-               </ProjectConfiguration>
-       </ItemGroup>
-       <PropertyGroup Label="Globals">
-               <ProjectGuid>{F3A80987-5411-43DB-A23B-06F2076E1207}</ProjectGuid>
-               <RootNamespace>coglpath</RootNamespace>
-               <Keyword>Win32Proj</Keyword>
-       </PropertyGroup>
-       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'" Label="Configuration">
-               <ConfigurationType>StaticLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-               <WholeProgramOptimization>true</WholeProgramOptimization>
-       </PropertyGroup>
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-               <ConfigurationType>StaticLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-               <WholeProgramOptimization>true</WholeProgramOptimization>
-       </PropertyGroup>
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'" Label="Configuration">
-               <ConfigurationType>StaticLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-       </PropertyGroup>
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-               <ConfigurationType>StaticLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-       </PropertyGroup>
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'" Label="Configuration">
-               <ConfigurationType>StaticLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-       </PropertyGroup>
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-               <ConfigurationType>StaticLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-       </PropertyGroup>
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'" Label="Configuration">
-               <ConfigurationType>StaticLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-       </PropertyGroup>
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-               <ConfigurationType>StaticLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-       </PropertyGroup>
-       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-       <ImportGroup Label="ExtensionSettings">
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <PropertyGroup Label="UserMacros" />
-       <PropertyGroup>
-               <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(SolutionDir)\Debug\$(Platform)\bin\</OutDir>
-               <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(SolutionDir)\Debug\$(Platform)\bin\</OutDir>
-               <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(SolutionDir)\Release\$(Platform)\bin\</OutDir>
-               <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(SolutionDir)\Release\$(Platform)\bin\</OutDir>
-       </PropertyGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-               <PreBuildEvent>
-                       <Command>
-$(DoDefines)
-$(PreBuildCmd)
-                       </Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       <Optimization>Disabled</Optimization>
-                       
<AdditionalIncludeDirectories>..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-                       
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <MinimalRebuild>true</MinimalRebuild>
-                       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-                       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-               </ClCompile>
-       </ItemDefinitionGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">
-               <PreBuildEvent>
-                       <Command>
-$(DoDefinesSDL)
-$(PreBuildCmd)
-                       </Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       <Optimization>Disabled</Optimization>
-                       
<AdditionalIncludeDirectories>..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-                       
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <MinimalRebuild>true</MinimalRebuild>
-                       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-                       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-               </ClCompile>
-       </ItemDefinitionGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-               <PreBuildEvent>
-                       <Command>
-$(DoDefines)
-$(PreBuildCmd)
-                       </Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       <Optimization>Disabled</Optimization>
-                       
<AdditionalIncludeDirectories>..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-                       
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <MinimalRebuild>true</MinimalRebuild>
-                       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-                       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-               </ClCompile>
-       </ItemDefinitionGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">
-               <PreBuildEvent>
-                       <Command>
-$(DoDefinesSDL)
-$(PreBuildCmd)
-                       </Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       <Optimization>Disabled</Optimization>
-                       
<AdditionalIncludeDirectories>..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-                       
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <MinimalRebuild>true</MinimalRebuild>
-                       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-                       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-               </ClCompile>
-       </ItemDefinitionGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-               <PreBuildEvent>
-                       <Command>
-$(DoDefines)
-$(PreBuildCmd)
-                       </Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       <Optimization>MaxSpeed</Optimization>
-                       
<AdditionalIncludeDirectories>..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-                       <IntrinsicFunctions>true</IntrinsicFunctions>
-                       
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-                       <FunctionLevelLinking>true</FunctionLevelLinking>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-               </ClCompile>
-       </ItemDefinitionGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">
-               <PreBuildEvent>
-                       <Command>
-$(DoDefinesSDL)
-$(PreBuildCmd)
-                       </Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       <Optimization>MaxSpeed</Optimization>
-                       
<AdditionalIncludeDirectories>..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-                       <IntrinsicFunctions>true</IntrinsicFunctions>
-                       
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-                       <FunctionLevelLinking>true</FunctionLevelLinking>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-               </ClCompile>
-       </ItemDefinitionGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-               <PreBuildEvent>
-                       <Command>
-$(DoDefines)
-$(PreBuildCmd)
-                       </Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       
<AdditionalIncludeDirectories>..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-                       
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-               </ClCompile>
-       </ItemDefinitionGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">
-               <PreBuildEvent>
-                       <Command>
-$(DoDefinesSDL)
-$(PreBuildCmd)
-                       </Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       
<AdditionalIncludeDirectories>..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-                       
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-               </ClCompile>
-       </ItemDefinitionGroup>
-       <ItemGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{F3A80987-5411-43DB-A23B-06F2076E1207}</ProjectGuid>
+    <RootNamespace>coglpath</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-gen-srcs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PreBuildEvent>
+      <Command></Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      
<AdditionalIncludeDirectories>..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PreBuildEvent>
+      <Command></Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      
<AdditionalIncludeDirectories>..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PreBuildEvent>
+      <Command></Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      
<AdditionalIncludeDirectories>..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PreBuildEvent>
+      <Command></Command>
+    </PreBuildEvent>
+    <ClCompile>
+      
<AdditionalIncludeDirectories>..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
 #include "cogl-path.vs10.sourcefiles"
-               <ClCompile Include="..\..\..\cogl-path\cogl-path-enum-types.c" />
-       </ItemGroup>
-       <ItemGroup>
-               <CustomBuild Include="..\..\..\cogl-path\cogl-path-enum-types.h.in">
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.h</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(GenCoglPathEnumsH)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.h</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(GenCoglPathEnumsH)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.h</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenCoglPathEnumsH)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.h</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenCoglPathEnumsH)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.h</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(GenCoglPathEnumsH)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.h</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(GenCoglPathEnumsH)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.h</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenCoglPathEnumsH)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.h</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenCoglPathEnumsH)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs)</Outputs>
-               </CustomBuild>
-               <CustomBuild Include="..\..\..\cogl-path\cogl-path-enum-types.c.in">
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.c</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(GenCoglPathEnumsC)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.c</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(GenCoglPathEnumsC)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.c</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenCoglPathEnumsC)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.c</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenCoglPathEnumsC)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.c</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(GenCoglPathEnumsC)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.c</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(GenCoglPathEnumsC)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.c</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenCoglPathEnumsC)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.c</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenCoglPathEnumsC)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs)</Outputs>
-               </CustomBuild>
-       </ItemGroup>
-       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-       <ImportGroup Label="ExtensionTargets">
-       </ImportGroup>
-</Project>
\ No newline at end of file
+    <ClCompile Include="..\..\..\cogl-path\cogl-path-enum-types.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\cogl-path\cogl-path-enum-types.h.in">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenCoglPathEnumsH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenCoglPathEnumsH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenCoglPathEnumsH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenCoglPathEnumsH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\cogl-path\cogl-path-enum-types.c.in">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.c</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenCoglPathEnumsC)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.c</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenCoglPathEnumsC)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.c</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenCoglPathEnumsC)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating 
..\..\..\cogl-path\cogl-path-enum-types.c</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenCoglPathEnumsC)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\cogl-path\cogl-path.symbols">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating 
cogl-path.symbols...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateCoglPathDef)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\cogl-path.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating 
cogl-path.symbols...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateCoglPathDef)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\cogl-path.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating 
cogl-path.symbols...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateCoglPathDef)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\cogl-path.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating 
cogl-path.symbols...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateCoglPathDef)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\cogl-path.def;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="cogl.vcxproj">
+      <Project>{f3a80987-5411-43db-a23b-06f2076e1206}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/build/win32/vs10/cogl-sdl-hello.vcxproj b/build/win32/vs10/cogl-sdl2-hello.vcxproj
similarity index 91%
rename from build/win32/vs10/cogl-sdl-hello.vcxproj
rename to build/win32/vs10/cogl-sdl2-hello.vcxproj
index 1186e66..9e4f9ae 100644
--- a/build/win32/vs10/cogl-sdl-hello.vcxproj
+++ b/build/win32/vs10/cogl-sdl2-hello.vcxproj
@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{0B5D144D-1872-42CD-8437-FFDCDD08C03E}</ProjectGuid>
-    <RootNamespace>coglsdlhello</RootNamespace>
+    <RootNamespace>coglsdl2hello</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -47,19 +47,19 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
+    <Import Project="cogl-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
+    <Import Project="cogl-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
+    <Import Project="cogl-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
+    <Import Project="cogl-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -82,7 +82,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>SDL.lib;SDLmain.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -102,7 +102,7 @@
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>SDL.lib;SDLmain.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -124,7 +124,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>SDL.lib;SDLmain.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -143,7 +143,7 @@
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>SDL.lib;SDLmain.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -155,7 +155,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\examples\cogl-sdl-hello.c" />
+    <ClCompile Include="..\..\..\examples\cogl-sdl2-hello.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="cogl.vcxproj">
@@ -166,4 +166,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/cogl-sdl-hello.vcxproj.filters 
b/build/win32/vs10/cogl-sdl2-hello.vcxproj.filters
similarity index 85%
rename from build/win32/vs10/cogl-sdl-hello.vcxproj.filters
rename to build/win32/vs10/cogl-sdl2-hello.vcxproj.filters
index 6bdc21a..967dc65 100644
--- a/build/win32/vs10/cogl-sdl-hello.vcxproj.filters
+++ b/build/win32/vs10/cogl-sdl2-hello.vcxproj.filters
@@ -7,7 +7,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\examples\cogl-sdl-hello.c">
+    <ClCompile Include="..\..\..\examples\cogl-sdl2-hello.c">
       <Filter>Sources</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/build/win32/vs10/cogl-version-paths.props b/build/win32/vs10/cogl-version-paths.props
new file mode 100644
index 0000000..2979609
--- /dev/null
+++ b/build/win32/vs10/cogl-version-paths.props
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <PropertyGroup Label="UserMacros">
+    <VSVer>10</VSVer>
+    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+    <ApiVersion>1.0</ApiVersion>
+    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
+    <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
+    <CoglLibtoolCompatibleDllPrefix>lib</CoglLibtoolCompatibleDllPrefix>
+    <CoglLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</CoglLibtoolCompatibleDllSuffix>
+    <CoglSeparateVSDllPrefix />
+    <CoglSeparateVSDllSuffix>-1-vs$(VSVer)</CoglSeparateVSDllSuffix>
+    <!-- Change CoglSeparateVSDllPrefix to CoglLibtoolCompatibleDllPrefix if libtool-style DLL prefixes are 
desired -->
+    <!-- Change CoglSeparateVSDllSuffix to CoglLibtoolCompatibleDllSuffix if libtool-style DLL suffixes are 
desired -->
+    <CoglDllPrefix>$(CoglSeparateVSDllPrefix)</CoglDllPrefix>
+    <CoglDllSuffix>$(CoglSeparateVSDllSuffix)</CoglDllSuffix>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>coglversionpathsprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="GlibEtcInstallRoot">
+      <Value>$(GlibEtcInstallRoot)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CopyDir">
+      <Value>$(CopyDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="DefDir">
+      <Value>$(DefDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ApiVersion">
+      <Value>$(ApiVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CoglLibtoolCompatibleDllPrefix">
+      <Value>$(CoglLibtoolCompatibleDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CoglLibtoolCompatibleDllSuffix">
+      <Value>$(CoglLibtoolCompatibleDllSuffix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CoglSeparateVSDllPrefix">
+      <Value>$(CoglSeparateVSDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CoglSeparateVSDllSuffix">
+      <Value>$(CoglSeparateVSDllSuffix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CoglDllPrefix">
+      <Value>$(CoglDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CoglDllSuffix">
+      <Value>$(CoglDllSuffix)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/cogl.sln b/build/win32/vs10/cogl.sln
index 1ab14ca..693587e 100644
--- a/build/win32/vs10/cogl.sln
+++ b/build/win32/vs10/cogl.sln
@@ -1,14 +1,16 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-path", "cogl-path.vcxproj", 
"{F3A80987-5411-43DB-A23B-06F2076E1207}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl", "cogl.vcxproj", 
"{F3A80987-5411-43DB-A23B-06F2076E1206}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-path", "cogl-path.vcxproj", 
"{F3A80987-5411-43DB-A23B-06F2076E1207}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-pango", "cogl-pango.vcxproj", 
"{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-hello", "cogl-hello.vcxproj", 
"{F5A43C12-7032-428E-A56A-D294075FA493}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-sdl2-hello", "cogl-sdl2-hello.vcxproj", 
"{0B5D144D-1872-42CD-8437-FFDCDD08C03E}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-info", "cogl-info.vcxproj", 
"{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", 
"{35B2A4AC-7235-4FC7-995D-469D59195041}"
@@ -20,19 +22,15 @@ EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
+               Debug_SDL|Win32 = Debug_SDL|Win32
                Debug|x64 = Debug|x64
+               Debug_SDL|x64 = Debug_SDL|x64
                Release|Win32 = Release|Win32
+               Release_SDL|Win32 = Release_SDL|Win32
                Release|x64 = Release|x64
+               Release_SDL|x64 = Release_SDL|x64
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|Win32.ActiveCfg = Debug|Win32
-               {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|Win32.Build.0 = Debug|Win32
-               {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|x64.ActiveCfg = Debug|x64
-               {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|x64.Build.0 = Debug|x64
-               {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|Win32.ActiveCfg = Release|Win32
-               {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|Win32.Build.0 = Release|Win32
-               {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|x64.ActiveCfg = Release|x64
-               {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|x64.Build.0 = Release|x64
                {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|Win32.ActiveCfg = Debug|Win32
                {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|Win32.Build.0 = Debug|Win32
                {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|x64.ActiveCfg = Debug|x64
@@ -41,6 +39,30 @@ Global
                {F3A80987-5411-43DB-A23B-06F2076E1206}.Release|Win32.Build.0 = Release|Win32
                {F3A80987-5411-43DB-A23B-06F2076E1206}.Release|x64.ActiveCfg = Release|x64
                {F3A80987-5411-43DB-A23B-06F2076E1206}.Release|x64.Build.0 = Release|x64
+               {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug_SDL|Win32.ActiveCfg = Debug_SDL|Win32
+               {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug_SDL|Win32.Build.0 = Debug_SDL|Win32
+               {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug_SDL|x64.ActiveCfg = Debug_SDL|x64
+               {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug_SDL|x64.Build.0 = Debug_SDL|x64
+               {F3A80987-5411-43DB-A23B-06F2076E1206}.Release_SDL|Win32.ActiveCfg = Release_SDL|Win32
+               {F3A80987-5411-43DB-A23B-06F2076E1206}.Release_SDL|Win32.Build.0 = Release_SDL|Win32
+               {F3A80987-5411-43DB-A23B-06F2076E1206}.Release_SDL|x64.ActiveCfg = Release_SDL|x64
+               {F3A80987-5411-43DB-A23B-06F2076E1206}.Release_SDL|x64.Build.0 = Release_SDL|x64
+               {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|Win32.ActiveCfg = Debug|Win32
+               {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|Win32.Build.0 = Debug|Win32
+               {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|x64.ActiveCfg = Debug|x64
+               {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|x64.Build.0 = Debug|x64
+               {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|Win32.ActiveCfg = Release|Win32
+               {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|Win32.Build.0 = Release|Win32
+               {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|x64.ActiveCfg = Release|x64
+               {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|x64.Build.0 = Release|x64
+               {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug_SDL|Win32.ActiveCfg = Debug|Win32
+               {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug_SDL|Win32.Build.0 = Debug|Win32
+               {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug_SDL|x64.ActiveCfg = Debug|x64
+               {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug_SDL|x64.Build.0 = Debug|x64
+               {F3A80987-5411-43DB-A23B-06F2076E1207}.Release_SDL|Win32.ActiveCfg = Release|Win32
+               {F3A80987-5411-43DB-A23B-06F2076E1207}.Release_SDL|Win32.Build.0 = Release|Win32
+               {F3A80987-5411-43DB-A23B-06F2076E1207}.Release_SDL|x64.ActiveCfg = Release|x64
+               {F3A80987-5411-43DB-A23B-06F2076E1207}.Release_SDL|x64.Build.0 = Release|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
@@ -49,6 +71,14 @@ Global
                {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
+               {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug_SDL|Win32.ActiveCfg = Debug|Win32
+               {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug_SDL|Win32.Build.0 = Debug|Win32
+               {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug_SDL|x64.ActiveCfg = Debug|x64
+               {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug_SDL|x64.Build.0 = Debug|x64
+               {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release_SDL|Win32.ActiveCfg = Release|Win32
+               {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release_SDL|Win32.Build.0 = Release|Win32
+               {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release_SDL|x64.ActiveCfg = Release|x64
+               {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release_SDL|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
@@ -57,6 +87,22 @@ Global
                {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
+               {F5A43C12-7032-428E-A56A-D294075FA493}.Debug_SDL|Win32.ActiveCfg = Debug|Win32
+               {F5A43C12-7032-428E-A56A-D294075FA493}.Debug_SDL|Win32.Build.0 = Debug|Win32
+               {F5A43C12-7032-428E-A56A-D294075FA493}.Debug_SDL|x64.ActiveCfg = Debug|x64
+               {F5A43C12-7032-428E-A56A-D294075FA493}.Debug_SDL|x64.Build.0 = Debug|x64
+               {F5A43C12-7032-428E-A56A-D294075FA493}.Release_SDL|Win32.ActiveCfg = Release|Win32
+               {F5A43C12-7032-428E-A56A-D294075FA493}.Release_SDL|Win32.Build.0 = Release|Win32
+               {F5A43C12-7032-428E-A56A-D294075FA493}.Release_SDL|x64.ActiveCfg = Release|x64
+               {F5A43C12-7032-428E-A56A-D294075FA493}.Release_SDL|x64.Build.0 = Release|x64
+               {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug_SDL|Win32.ActiveCfg = Debug|Win32
+               {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug_SDL|Win32.Build.0 = Debug|Win32
+               {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug_SDL|x64.ActiveCfg = Debug|x64
+               {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug_SDL|x64.Build.0 = Debug|x64
+               {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release_SDL|Win32.ActiveCfg = Release|Win32
+               {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release_SDL|Win32.Build.0 = Release|Win32
+               {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release_SDL|x64.ActiveCfg = Release|x64
+               {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release_SDL|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
@@ -65,6 +111,14 @@ Global
                {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
+               {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug_SDL|Win32.ActiveCfg = Debug|Win32
+               {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug_SDL|Win32.Build.0 = Debug|Win32
+               {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug_SDL|x64.ActiveCfg = Debug|x64
+               {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug_SDL|x64.Build.0 = Debug|x64
+               {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release_SDL|Win32.ActiveCfg = Release|Win32
+               {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release_SDL|Win32.Build.0 = Release|Win32
+               {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release_SDL|x64.ActiveCfg = Release|x64
+               {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release_SDL|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
@@ -73,6 +127,14 @@ Global
                {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
+               {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug_SDL|Win32.ActiveCfg = Debug|Win32
+               {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug_SDL|Win32.Build.0 = Debug|Win32
+               {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug_SDL|x64.ActiveCfg = Debug|x64
+               {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug_SDL|x64.Build.0 = Debug|x64
+               {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release_SDL|Win32.ActiveCfg = Release|Win32
+               {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release_SDL|Win32.Build.0 = Release|Win32
+               {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release_SDL|x64.ActiveCfg = Release|x64
+               {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release_SDL|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
@@ -81,6 +143,14 @@ Global
                {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
+               {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_SDL|Win32.ActiveCfg = Debug|Win32
+               {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_SDL|Win32.Build.0 = Debug|Win32
+               {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_SDL|x64.ActiveCfg = Debug|x64
+               {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_SDL|x64.Build.0 = Debug|x64
+               {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_SDL|Win32.ActiveCfg = Release|Win32
+               {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_SDL|Win32.Build.0 = Release|Win32
+               {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_SDL|x64.ActiveCfg = Release|x64
+               {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_SDL|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
@@ -89,6 +159,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_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
diff --git a/build/win32/vs10/cogl.vcxproj.filtersin b/build/win32/vs10/cogl.vcxproj.filtersin
index 963c238..92d1198 100644
--- a/build/win32/vs10/cogl.vcxproj.filtersin
+++ b/build/win32/vs10/cogl.vcxproj.filtersin
@@ -15,7 +15,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\cogl\winsys\cogl-winsys-wgl.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\..\cogl\winsys\cogl-winsys-sdl.c"><Filter>Sources</Filter></ClCompile>
+    <ClCompile Include="..\..\..\cogl\winsys\cogl-winsys-sdl2.c"><Filter>Sources</Filter></ClCompile>
     <ClCompile Include="..\..\..\cogl\cogl-sdl.c"><Filter>Sources</Filter></ClCompile>
     <ClCompile Include="..\..\..\cogl\cogl-win32-renderer.c"><Filter>Sources</Filter></ClCompile>
 #include "cogl.vs10.sourcefiles.filters"
@@ -30,8 +30,12 @@
     <ClCompile 
Include="..\..\..\cogl\driver\gl\cogl-util-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\..\cogl\cogl-gl-headers.h.win32"><Filter>Resource 
Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\..\cogl\cogl-defines.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\..\cogl\cogl-defines.h.win32_SDL"><Filter>Resource 
Files</Filter></CustomBuild>
     <CustomBuild Include="..\..\..\cogl\cogl.symbols"><Filter>Resource Files</Filter></CustomBuild>
     <CustomBuild Include="..\..\..\cogl\cogl-enum-types.h.in"><Filter>Resource Files</Filter></CustomBuild>
     <CustomBuild Include="..\..\..\cogl\cogl-enum-types.c.in"><Filter>Resource Files</Filter></CustomBuild>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/cogl.vcxprojin b/build/win32/vs10/cogl.vcxprojin
index 970901c..cc3be48 100644
--- a/build/win32/vs10/cogl.vcxprojin
+++ b/build/win32/vs10/cogl.vcxprojin
@@ -1,479 +1,529 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
-       <ItemGroup Label="ProjectConfigurations">
-               <ProjectConfiguration Include="Debug|Win32">
-                       <Configuration>Debug</Configuration>
-                       <Platform>Win32</Platform>
-               </ProjectConfiguration>
-               <ProjectConfiguration Include="Debug_SDL|Win32">
-                       <Configuration>Debug_SDL</Configuration>
-                       <Platform>Win32</Platform>
-               </ProjectConfiguration>
-               <ProjectConfiguration Include="Debug|x64">
-                       <Configuration>Debug</Configuration>
-                       <Platform>x64</Platform>
-               </ProjectConfiguration>
-               <ProjectConfiguration Include="Debug_SDL|x64">
-                       <Configuration>Debug_SDL</Configuration>
-                       <Platform>x64</Platform>
-               </ProjectConfiguration>
-               <ProjectConfiguration Include="Release|Win32">
-                       <Configuration>Release</Configuration>
-                       <Platform>Win32</Platform>
-               </ProjectConfiguration>
-               <ProjectConfiguration Include="Release_SDL|Win32">
-                       <Configuration>Release_SDL</Configuration>
-                       <Platform>Win32</Platform>
-               </ProjectConfiguration>
-               <ProjectConfiguration Include="Release|x64">
-                       <Configuration>Release</Configuration>
-                       <Platform>x64</Platform>
-               </ProjectConfiguration>
-               <ProjectConfiguration Include="Release_SDL|x64">
-                       <Configuration>Release_SDL</Configuration>
-                       <Platform>x64</Platform>
-               </ProjectConfiguration>
-       </ItemGroup>
-       <PropertyGroup Label="Globals">
-               <ProjectGuid>{F3A80987-5411-43DB-A23B-06F2076E1206}</ProjectGuid>
-               <RootNamespace>cogl</RootNamespace>
-               <Keyword>Win32Proj</Keyword>
-       </PropertyGroup>
-       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-               <ConfigurationType>DynamicLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-               <WholeProgramOptimization>true</WholeProgramOptimization>
-       </PropertyGroup>
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'" Label="Configuration">
-               <ConfigurationType>DynamicLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-               <WholeProgramOptimization>true</WholeProgramOptimization>
-       </PropertyGroup>
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-               <ConfigurationType>DynamicLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-       </PropertyGroup>
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'" Label="Configuration">
-               <ConfigurationType>DynamicLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-       </PropertyGroup>
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-               <ConfigurationType>DynamicLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-       </PropertyGroup>
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'" Label="Configuration">
-               <ConfigurationType>DynamicLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-       </PropertyGroup>
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-               <ConfigurationType>DynamicLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-       </PropertyGroup>
-       <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'" Label="Configuration">
-               <ConfigurationType>DynamicLibrary</ConfigurationType>
-               <CharacterSet>MultiByte</CharacterSet>
-       </PropertyGroup>
-       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-       <ImportGroup Label="ExtensionSettings">
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'" Label="PropertySheets">
-               <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-               <Import Project="cogl.props" />
-       </ImportGroup>
-       <PropertyGroup Label="UserMacros" />
-       <PropertyGroup>
-               <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-               <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">true</LinkIncremental>
-               <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">Debug\$(Platform)\bin\</OutDir>
-               <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-               <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">true</LinkIncremental>
-               <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">Debug\$(Platform)\bin\</OutDir>
-               <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-               <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">false</LinkIncremental>
-               <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">Release\$(Platform)\bin\</OutDir>
-               <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
-               <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">true</LinkIncremental>
-               <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">Release\$(Platform)\bin\</OutDir>
-       </PropertyGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-               <PreBuildEvent>
-                       <Command>
-                       $(DoDefines)
-                       $(PreBuildCmd)
-                       </Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       <Optimization>Disabled</Optimization>
-                       
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-                       
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <MinimalRebuild>true</MinimalRebuild>
-                       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-                       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-               </ClCompile>
-               <Link>
-                       
<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-                       <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
-                       <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-                       <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-                       <GenerateDebugInformation>true</GenerateDebugInformation>
-                       <SubSystem>Windows</SubSystem>
-                       <TargetMachine>MachineX86</TargetMachine>
-               </Link>
-       </ItemDefinitionGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">
-               <PreBuildEvent>
-                       <Command>
-                       $(DoDefinesSDL)
-                       $(PreBuildCmd)
-                       </Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       <Optimization>Disabled</Optimization>
-                       
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-                       
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <MinimalRebuild>true</MinimalRebuild>
-                       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-                       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-               </ClCompile>
-               <Link>
-                       
<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-                       <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
-                       <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-                       <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-                       <GenerateDebugInformation>true</GenerateDebugInformation>
-                       <SubSystem>Windows</SubSystem>
-                       <TargetMachine>MachineX86</TargetMachine>
-               </Link>
-       </ItemDefinitionGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-               <PreBuildEvent>
-                       <Command>
-                       $(DoDefines)
-                       $(PreBuildCmd)
-                       </Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       <Optimization>Disabled</Optimization>
-                       
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-                       
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <MinimalRebuild>true</MinimalRebuild>
-                       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-                       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-               </ClCompile>
-               <Link>
-                       
<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-                       <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
-                       <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-                       <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-                       <GenerateDebugInformation>true</GenerateDebugInformation>
-                       <SubSystem>Windows</SubSystem>
-                       <TargetMachine>MachineX64</TargetMachine>
-               </Link>
-       </ItemDefinitionGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">
-               <PreBuildEvent>
-                       <Command>
-                       $(DoDefinesSDL)
-                       $(PreBuildCmd)
-                       </Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       <Optimization>Disabled</Optimization>
-                       
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-                       
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <MinimalRebuild>true</MinimalRebuild>
-                       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-                       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-               </ClCompile>
-               <Link>
-                       
<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-                       <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
-                       <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-                       <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-                       <GenerateDebugInformation>true</GenerateDebugInformation>
-                       <SubSystem>Windows</SubSystem>
-                       <TargetMachine>MachineX64</TargetMachine>
-               </Link>
-       </ItemDefinitionGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-               <PreBuildEvent>
-                       <Command>
-                       $(DoDefines)
-                       $(PreBuildCmd)
-                       </Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       <Optimization>MaxSpeed</Optimization>
-                       
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-                       <IntrinsicFunctions>true</IntrinsicFunctions>
-                       
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-                       <FunctionLevelLinking>true</FunctionLevelLinking>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-               </ClCompile>
-               <Link>
-                       
<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-                       <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
-                       <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-                       <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-                       <GenerateDebugInformation>true</GenerateDebugInformation>
-                       <SubSystem>Windows</SubSystem>
-                       <OptimizeReferences>true</OptimizeReferences>
-                       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-                       <TargetMachine>MachineX86</TargetMachine>
-               </Link>
-       </ItemDefinitionGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">
-               <PreBuildEvent>
-                       <Command>
-                       $(DoDefinesSDL)
-                       $(PreBuildCmd)
-                       </Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       <Optimization>MaxSpeed</Optimization>
-                       
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-                       <IntrinsicFunctions>true</IntrinsicFunctions>
-                       
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-                       <FunctionLevelLinking>true</FunctionLevelLinking>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-               </ClCompile>
-               <Link>
-                       
<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-                       <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
-                       <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-                       <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-                       <GenerateDebugInformation>true</GenerateDebugInformation>
-                       <SubSystem>Windows</SubSystem>
-                       <OptimizeReferences>true</OptimizeReferences>
-                       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-                       <TargetMachine>MachineX86</TargetMachine>
-               </Link>
-       </ItemDefinitionGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-               <PreBuildEvent>
-                       <Command>
-                       $(DoDefines)
-                       $(PreBuildCmd)
-                       </Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-                       
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-               </ClCompile>
-               <Link>
-                       
<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-                       <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
-                       <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-                       <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-                       <GenerateDebugInformation>true</GenerateDebugInformation>
-                       <SubSystem>Windows</SubSystem>
-                       <OptimizeReferences>true</OptimizeReferences>
-                       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-                       <TargetMachine>MachineX64</TargetMachine>
-               </Link>
-       </ItemDefinitionGroup>
-       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">
-               <PreBuildEvent>
-                       <Command>
-                       $(DoDefinesSDL)
-                       $(PreBuildCmd)
-                       </Command>
-               </PreBuildEvent>
-               <ClCompile>
-                       
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-                       
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-                       <PrecompiledHeader>
-                       </PrecompiledHeader>
-                       <WarningLevel>Level3</WarningLevel>
-                       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-               </ClCompile>
-               <Link>
-                       
<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-                       <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
-                       <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
-                       <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-                       <GenerateDebugInformation>true</GenerateDebugInformation>
-                       <SubSystem>Windows</SubSystem>
-                       <OptimizeReferences>true</OptimizeReferences>
-                       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-                       <TargetMachine>MachineX64</TargetMachine>
-               </Link>
-       </ItemDefinitionGroup>
-       <ItemGroup>
-               <ClCompile Include="..\..\..\cogl\winsys\cogl-winsys-wgl.c" />
-               <ClCompile Include="..\..\..\cogl\winsys\cogl-winsys-sdl.c">
-                       <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-                       <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-                       <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-                       <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-               </ClCompile>
-               <ClCompile Include="..\..\..\cogl\cogl-sdl.c">
-                       <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-                       <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-                       <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-                       <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-               </ClCompile>
-               <ClCompile Include="..\..\..\cogl\cogl-win32-renderer.c" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_SDL|Win32">
+      <Configuration>Debug_SDL</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_SDL|x64">
+      <Configuration>Debug_SDL</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_SDL|Win32">
+      <Configuration>Release_SDL</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_SDL|x64">
+      <Configuration>Release_SDL</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{F3A80987-5411-43DB-A23B-06F2076E1206}</ProjectGuid>
+    <RootNamespace>cogl</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-gen-srcs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">Debug\$(Platform)\bin\</OutDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">Debug\$(Platform)\bin\</OutDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">Release\$(Platform)\bin\</OutDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">Release\$(Platform)\bin\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PreBuildEvent>
+      <Command></Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      
<AdditionalIncludeDirectories>..\..\..\cogl\deprecated;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      
<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">
+    <PreBuildEvent>
+      <Command></Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      
<AdditionalIncludeDirectories>..\..\..\cogl\deprecated;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      
<AdditionalDependencies>SDL2.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PreBuildEvent>
+      <Command></Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      
<AdditionalIncludeDirectories>..\..\..\cogl\deprecated;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      
<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">
+    <PreBuildEvent>
+      <Command></Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      
<AdditionalIncludeDirectories>..\..\..\cogl\deprecated;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      
<AdditionalDependencies>SDL2.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PreBuildEvent>
+      <Command></Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      
<AdditionalIncludeDirectories>..\..\..\cogl\deprecated;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      
<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">
+    <PreBuildEvent>
+      <Command></Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      
<AdditionalIncludeDirectories>..\..\..\cogl\deprecated;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      
<AdditionalDependencies>SDL2.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PreBuildEvent>
+      <Command></Command>
+    </PreBuildEvent>
+    <ClCompile>
+      
<AdditionalIncludeDirectories>..\..\..\cogl\deprecated;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      
<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">
+    <PreBuildEvent>
+      <Command></Command>
+    </PreBuildEvent>
+    <ClCompile>
+      
<AdditionalIncludeDirectories>..\..\..\cogl\deprecated;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      
<AdditionalDependencies>SDL2.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\cogl\winsys\cogl-winsys-wgl.c" />
+    <ClCompile Include="..\..\..\cogl\winsys\cogl-winsys-sdl2.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\cogl\cogl-sdl.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\cogl\cogl-win32-renderer.c" />
 #include "cogl.vs10.sourcefiles"
-               <ClCompile Include="..\..\..\cogl\driver\gl\gl\cogl-driver-gl.c" />
-               <ClCompile Include="..\..\..\cogl\driver\gl\gl\cogl-texture-driver-gl.c" />
-               <ClCompile Include="..\..\..\cogl\driver\gl\cogl-attribute-gl.c" />
-               <ClCompile Include="..\..\..\cogl\driver\gl\cogl-buffer-gl.c" />
-               <ClCompile Include="..\..\..\cogl\driver\gl\cogl-clip-stack-gl.c" />
-               <ClCompile Include="..\..\..\cogl\driver\gl\cogl-framebuffer-gl.c" />
-               <ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-gl.c" />
-               <ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-2d-gl.c" />
-               <ClCompile Include="..\..\..\cogl\driver\gl\cogl-util-gl.c" />
-       </ItemGroup>
-       <ItemGroup>
-               <CustomBuild Include="..\..\..\cogl\cogl.symbols">
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">Generating 
$(IntDir)\cogl.def</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(GenerateCoglSDLDef)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">Generating 
$(IntDir)\cogl.def</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(GenerateCoglSDLDef)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating 
$(IntDir)\cogl.def</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateCoglDef)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating 
$(IntDir)\cogl.def</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateCoglDef)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">Generating 
$(IntDir)\cogl.def</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(GenerateCoglSDLDef)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">Generating 
$(IntDir)\cogl.def</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(GenerateCoglSDLDef)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating 
$(IntDir)\cogl.def</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateCoglDef)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating 
$(IntDir)\cogl.def</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateCoglDef)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
-               </CustomBuild>
-               <CustomBuild Include="..\..\..\cogl\cogl-enum-types.h.in">
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">Generating 
..\..\..\cogl\cogl-enum-types.h</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(GenCoglEnumsH)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">Generating 
..\..\..\cogl\cogl-enum-types.h</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(GenCoglEnumsH)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating 
..\..\..\cogl\cogl-enum-types.h</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenCoglEnumsH)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating 
..\..\..\cogl\cogl-enum-types.h</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenCoglEnumsH)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">Generating 
..\..\..\cogl\cogl-enum-types.h</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(GenCoglEnumsH)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">Generating 
..\..\..\cogl\cogl-enum-types.h</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(GenCoglEnumsH)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating 
..\..\..\cogl\cogl-enum-types.h</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenCoglEnumsH)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating 
..\..\..\cogl\cogl-enum-types.h</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenCoglEnumsH)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
-               </CustomBuild>
-               <CustomBuild Include="..\..\..\cogl\cogl-enum-types.c.in">
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">Generating 
..\..\..\cogl\cogl-enum-types.c</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(GenCoglEnumsC)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">Generating 
..\..\..\cogl\cogl-enum-types.c</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(GenCoglEnumsC)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating 
..\..\..\cogl\cogl-enum-types.c</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenCoglEnumsC)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating 
..\..\..\cogl\cogl-enum-types.c</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenCoglEnumsC)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">Generating 
..\..\..\cogl\cogl-enum-types.c</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(GenCoglEnumsC)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">Generating 
..\..\..\cogl\cogl-enum-types.c</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(GenCoglEnumsC)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating 
..\..\..\cogl\cogl-enum-types.c</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenCoglEnumsC)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
-                       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating 
..\..\..\cogl\cogl-enum-types.c</Message>
-                       <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenCoglEnumsC)</Command>
-                       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
-               </CustomBuild>
-       </ItemGroup>
-       <ItemGroup>
-               <ResourceCompile Include="..\..\..\cogl\cogl.rc" />
-       </ItemGroup>
-       <ItemGroup>
-               <ProjectReference Include="cogl-path.vcxproj">
-                       <Project>{f3a80987-5411-43db-a23b-06f2076e1207}</Project>
-                       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-               </ProjectReference>
-       </ItemGroup>
-       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-       <ImportGroup Label="ExtensionTargets">
-       </ImportGroup>
-</Project>
\ No newline at end of file
+    <ClCompile Include="..\..\..\cogl\driver\gl\gl\cogl-driver-gl.c" />
+    <ClCompile Include="..\..\..\cogl\driver\gl\gl\cogl-texture-driver-gl.c" />
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-attribute-gl.c" />
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-buffer-gl.c" />
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-clip-stack-gl.c" />
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-framebuffer-gl.c" />
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-gl.c" />
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-2d-gl.c" />
+    <ClCompile Include="..\..\..\cogl\driver\gl\cogl-util-gl.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\config.h.win32">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">Copying config.h from 
config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(CopyConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">Copying config.h from 
config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(CopyConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying config.h from 
config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying config.h from 
config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">Copying config.h from 
config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(CopyConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">Copying config.h from 
config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(CopyConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying config.h from 
config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying config.h from 
config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\config.h;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\cogl\cogl-gl-header.h.win32">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">Copying cogl-gl-header.h from 
cogl-gl-header.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(CopyGLHeaderH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">..\..\..\cogl\cogl-gl-header.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">Copying cogl-gl-header.h from 
cogl-gl-header.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(CopyGLHeaderH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">..\..\..\cogl\cogl-gl-header.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying cogl-gl-header.h from 
cogl-gl-header.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyGLHeaderH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\cogl\cogl-gl-header.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying cogl-gl-header.h from 
cogl-gl-header.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyGLHeaderH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\cogl\cogl-gl-header.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">Copying cogl-gl-header.h from 
cogl-gl-header.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(CopyGLHeaderH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">..\..\..\cogl\cogl-gl-header.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">Copying cogl-gl-header.h from 
cogl-gl-header.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(CopyGLHeaderH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">..\..\..\cogl\cogl-gl-header.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying cogl-gl-header.h from 
cogl-gl-header.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyGLHeaderH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\cogl\cogl-gl-header.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying cogl-gl-header.h from 
cogl-gl-header.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGLHeaderH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\cogl\cogl-gl-header.h;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\cogl\cogl-defines.h.win32">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying cogl-defines.h from 
cogl-defines.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyDefinesH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\cogl\cogl-defines.h;..\..\..\cogl\WGL_DEFINES;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying cogl-defines.h from 
cogl-defines.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyDefinesH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\cogl\cogl-defines.h;..\..\..\cogl\WGL_DEFINES;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying cogl-defines.h from 
cogl-defines.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyDefinesH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\cogl\cogl-defines.h;..\..\..\cogl\WGL_DEFINES;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying cogl-defines.h from 
cogl-defines.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyDefinesH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\cogl\cogl-defines.h;..\..\..\cogl\WGL_DEFINES;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\cogl\cogl-defines.h.win32_SDL">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">Copying cogl-defines.h from 
cogl-defines.h.win32_SDL...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(CopyDefinesSDLH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">..\..\..\cogl\cogl-defines.h;..\..\..\cogl\SDL_DEFINES;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">Copying cogl-defines.h from 
cogl-defines.h.win32_SDL...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(CopyDefinesSDLH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">..\..\..\cogl\cogl-defines.h;..\..\..\cogl\SDL_DEFINES;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">Copying cogl-defines.h from 
cogl-defines.h.win32_SDL...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(CopyDefinesSDLH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">..\..\..\cogl\cogl-defines.h;..\..\..\cogl\SDL_DEFINES;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">Copying cogl-defines.h from 
cogl-defines.h.win32_SDL...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(CopyDefinesSDLH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">..\..\..\cogl\cogl-defines.h;..\..\..\cogl\SDL_DEFINES;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\cogl\cogl.symbols">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">Generating 
$(IntDir)\cogl.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(GenerateCoglSDLDef)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">Generating 
$(IntDir)\cogl.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(GenerateCoglSDLDef)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating 
$(IntDir)\cogl.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateCoglDef)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating 
$(IntDir)\cogl.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateCoglDef)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">Generating 
$(IntDir)\cogl.def</Message>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(GenerateCoglSDLDef)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">Generating 
$(IntDir)\cogl.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(GenerateCoglSDLDef)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating 
$(IntDir)\cogl.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateCoglDef)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating 
$(IntDir)\cogl.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateCoglDef)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\cogl\cogl-enum-types.h.in">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">Generating 
..\..\..\cogl\cogl-enum-types.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(GenCoglEnumsH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">Generating 
..\..\..\cogl\cogl-enum-types.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(GenCoglEnumsH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating 
..\..\..\cogl\cogl-enum-types.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenCoglEnumsH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating 
..\..\..\cogl\cogl-enum-types.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenCoglEnumsH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">Generating 
..\..\..\cogl\cogl-enum-types.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(GenCoglEnumsH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">Generating 
..\..\..\cogl\cogl-enum-types.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(GenCoglEnumsH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating 
..\..\..\cogl\cogl-enum-types.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenCoglEnumsH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating 
..\..\..\cogl\cogl-enum-types.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenCoglEnumsH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\cogl\cogl-enum-types.c.in">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">Generating 
..\..\..\cogl\cogl-enum-types.c</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(GenCoglEnumsC)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">Generating 
..\..\..\cogl\cogl-enum-types.c</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(GenCoglEnumsC)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating 
..\..\..\cogl\cogl-enum-types.c</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenCoglEnumsC)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating 
..\..\..\cogl\cogl-enum-types.c</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenCoglEnumsC)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">Generating 
..\..\..\cogl\cogl-enum-types.c</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(GenCoglEnumsC)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">Generating 
..\..\..\cogl\cogl-enum-types.c</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(GenCoglEnumsC)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating 
..\..\..\cogl\cogl-enum-types.c</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenCoglEnumsC)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating 
..\..\..\cogl\cogl-enum-types.c</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenCoglEnumsC)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\cogl\cogl.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj
index 5b903b9..a002989 100644
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.vcxproj
@@ -1,121 +1,217 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{35B2A4AC-7235-4FC7-995D-469D59195041}</ProjectGuid>
-    <RootNamespace>install</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PostBuildEvent>
-      <Command>$(CoglDoInstall)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>$(CoglDoInstall)</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PostBuildEvent>
-      <Command>$(CoglDoInstall)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>$(CoglDoInstall)</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="test-conformance-cogl.vcxproj">
-      <Project>{0f08f253-de1a-40cb-a890-93ae3ca23ade}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="cogl-crate.vcxproj">
-      <Project>{de1a2710-04bb-4c3d-90c1-b070e326b1cf}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="cogl-hello.vcxproj">
-      <Project>{f5a43c12-7032-428e-a56a-d294075fa493}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="cogl-info.vcxproj">
-      <Project>{cd17f5c8-c860-4a65-8209-4d0b093a3da3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="cogl-pango.vcxproj">
-      <Project>{fe5abd0f-91e8-4aa5-9c1c-408427d5f768}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="cogl.vcxproj">
-      <Project>{f3a80987-5411-43db-a23b-06f2076e1206}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_SDL|Win32">
+      <Configuration>Debug_SDL</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_SDL|x64">
+      <Configuration>Debug_SDL</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_SDL|Win32">
+      <Configuration>Release_SDL</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_SDL|x64">
+      <Configuration>Release_SDL</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{35B2A4AC-7235-4FC7-995D-469D59195041}</ProjectGuid>
+    <RootNamespace>install</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-install.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-install.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-install.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-install.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-install.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-install.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-install.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="cogl-install.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(GlibEtcInstallRoot)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(GlibEtcInstallRoot)\</OutDir>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(GlibEtcInstallRoot)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(GlibEtcInstallRoot)\</OutDir>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PostBuildEvent>
+      <Command>$(CoglDoInstall)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">
+    <PostBuildEvent>
+      <Command>
+$(CoglDoInstall)
+$(CoglDoInstallSDL)
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PreBuildEvent>
+      <Command>$(CoglDoInstall)</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">
+    <PreBuildEvent>
+      <Command>
+$(CoglDoInstall)
+$(CoglDoInstallSDL)
+      </Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PostBuildEvent>
+      <Command>$(CoglDoInstall)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">
+    <PostBuildEvent>
+      <Command>
+$(CoglDoInstall)
+$(CoglDoInstallSDL)
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PreBuildEvent>
+      <Command>$(CoglDoInstall)</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">
+    <PreBuildEvent>
+      <Command>
+$(CoglDoInstall)
+$(CoglDoInstallSDL)
+      </Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="test-conformance-cogl.vcxproj">
+      <Project>{0f08f253-de1a-40cb-a890-93ae3ca23ade}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="cogl-crate.vcxproj">
+      <Project>{de1a2710-04bb-4c3d-90c1-b070e326b1cf}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="cogl-hello.vcxproj">
+      <Project>{f5a43c12-7032-428e-a56a-d294075fa493}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="cogl-sdl2-hello.vcxproj">
+      <Project>{0b5d144d-1872-42cd-8437-ffdcdd08c03e}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="cogl-info.vcxproj">
+      <Project>{cd17f5c8-c860-4a65-8209-4d0b093a3da3}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="cogl-pango.vcxproj">
+      <Project>{fe5abd0f-91e8-4aa5-9c1c-408427d5f768}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="cogl-path.vcxproj">
+      <Project>{f3a80987-5411-43db-a23b-06f2076e1207}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="cogl.vcxproj">
+      <Project>{f3a80987-5411-43db-a23b-06f2076e1206}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/build/win32/vs10/test-conformance-cogl.vcxproj.filtersin 
b/build/win32/vs10/test-conformance-cogl.vcxproj.filtersin
index a1b8af5..7d44a1f 100644
--- a/build/win32/vs10/test-conformance-cogl.vcxproj.filtersin
+++ b/build/win32/vs10/test-conformance-cogl.vcxproj.filtersin
@@ -10,4 +10,4 @@
 #include "testconformance.vs10.sourcefiles.filters"
     <ClCompile Include="..\..\..\test-fixtures\test-utils.c"><Filter>Sources</Filter></ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/test-conformance-cogl.vcxprojin 
b/build/win32/vs10/test-conformance-cogl.vcxprojin
index d1c7059..424901b 100644
--- a/build/win32/vs10/test-conformance-cogl.vcxprojin
+++ b/build/win32/vs10/test-conformance-cogl.vcxprojin
@@ -47,19 +47,19 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
+    <Import Project="cogl-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
+    <Import Project="cogl-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
+    <Import Project="cogl-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="cogl.props" />
+    <Import Project="cogl-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -72,7 +72,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       
<AdditionalIncludeDirectories>..\..\..\test-fixtures;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -92,7 +92,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       
<AdditionalIncludeDirectories>..\..\..\test-fixtures;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -117,7 +117,7 @@
       <Optimization>MaxSpeed</Optimization>
       
<AdditionalIncludeDirectories>..\..\..\test-fixtures;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -137,7 +137,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       
<AdditionalIncludeDirectories>..\..\..\test-fixtures;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -166,7 +166,11 @@
       <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-       <ProjectReference Include="cogl-pango.vcxproj">
+    <ProjectReference Include="cogl-path.vcxproj">
+      <Project>{f3a80987-5411-43db-a23b-06f2076e1207}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="cogl-pango.vcxproj">
       <Project>{fe5abd0f-91e8-4aa5-9c1c-408427d5f768}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
@@ -174,4 +178,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]