Visual C++ projects updates

-Fix up faulty Visual C++ 2010 Release_GDK configs
-Copy clutter-gdk.h as well when Clutter is also built with the GDK backend

7 files changed, 329 insertions, 185 deletions

diff --git a/build/win32/vs10/clutter.props b/build/win32/vs10/clutter.props
index 08f9f5cb4..cec317539 100644
--- a/build/win32/vs10/clutter.props
+++ b/build/win32/vs10/clutter.props
@@ -82,7 +82,7 @@ gen-enums.bat $(GlibEtcInstallRoot)
 cd .\vs10
 
 </PreBuildCmd2>
-    <ClutterDoInstall>
+<ClutterDoInstall>
 mkdir $(CopyDir)
 
 mkdir $(CopyDir)\bin
@@ -367,6 +367,11 @@ copy ..\..\..\clutter\cally\cally-util.h $(CopyDir)\include\clutter-$(ClutterApi
 
 
 </ClutterDoInstall>
+<ClutterDoInstallGDK>
+mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\gdk
+
+copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\gdk
+</ClutterDoInstallGDK>
     <GenerateClutterDef>
          echo EXPORTS &gt; ..\..\..\clutter\clutter.def
 
@@ -458,6 +463,9 @@ copy ..\..\..\clutter\cally\cally-util.h $(CopyDir)\include\clutter-$(ClutterApi
     <BuildMacro Include="ClutterDoInstall">
       <Value>$(ClutterDoInstall)</Value>
     </BuildMacro>
+    <BuildMacro Include="ClutterDoInstallGDK">
+      <Value>$(ClutterDoInstallGDK)</Value>
+    </BuildMacro>
     <BuildMacro Include="GenerateClutterDef">
       <Value>$(GenerateClutterDef)</Value>
     </BuildMacro>
diff --git a/build/win32/vs10/clutter.sln b/build/win32/vs10/clutter.sln
index cd43c6c21..1302d3a5c 100644
--- a/build/win32/vs10/clutter.sln
+++ b/build/win32/vs10/clutter.sln
@@ -1,6 +1,6 @@
 

 Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual Studio 2010
+# Visual Studio 2010

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clutter", "clutter.vcxproj", "{EA036190-0950-4640-84F9-D459A33B33A8}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-picking", "test-picking.vcxproj", "{F433DB3C-1223-489A-AD0C-C64B09F51139}"

@@ -45,348 +45,348 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj"
 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug_GDK|Win32 = Debug_GDK|Win32
-		Debug_GDK|x64 = Debug_GDK|x64
+		Debug_GDK|Win32 = Debug_GDK|Win32

+		Debug_GDK|x64 = Debug_GDK|x64

 		Debug|Win32 = Debug|Win32

 		Debug|x64 = Debug|x64

-		Release_GDK|Win32 = Release_GDK|Win32
-		Release_GDK|x64 = Release_GDK|x64
+		Release_GDK|Win32 = Release_GDK|Win32

+		Release_GDK|x64 = Release_GDK|x64

 		Release|Win32 = Release|Win32

 		Release|x64 = Release|x64

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{EA036190-0950-4640-84F9-D459A33B33A8}.Debug_GDK|Win32.ActiveCfg = Debug_GDK|Win32
-		{EA036190-0950-4640-84F9-D459A33B33A8}.Debug_GDK|Win32.ActiveCfg = Debug_GDK|Win32
-		{EA036190-0950-4640-84F9-D459A33B33A8}.Debug_GDK|x64.ActiveCfg = Debug_GDK|x64
-		{EA036190-0950-4640-84F9-D459A33B33A8}.Debug_GDK|x64.Build.0 = Debug_GDK|x64
+		{EA036190-0950-4640-84F9-D459A33B33A8}.Debug_GDK|Win32.ActiveCfg = Debug_GDK|Win32

+		{EA036190-0950-4640-84F9-D459A33B33A8}.Debug_GDK|Win32.ActiveCfg = Debug_GDK|Win32

+		{EA036190-0950-4640-84F9-D459A33B33A8}.Debug_GDK|x64.ActiveCfg = Debug_GDK|x64

+		{EA036190-0950-4640-84F9-D459A33B33A8}.Debug_GDK|x64.Build.0 = Debug_GDK|x64

 		{EA036190-0950-4640-84F9-D459A33B33A8}.Debug|Win32.ActiveCfg = Debug|Win32

 		{EA036190-0950-4640-84F9-D459A33B33A8}.Debug|Win32.Build.0 = Debug|Win32

 		{EA036190-0950-4640-84F9-D459A33B33A8}.Debug|x64.ActiveCfg = Debug|x64

 		{EA036190-0950-4640-84F9-D459A33B33A8}.Debug|x64.Build.0 = Debug|x64

-		{EA036190-0950-4640-84F9-D459A33B33A8}.Release_GDK|Win32.ActiveCfg = Release_GDK|Win32
-		{EA036190-0950-4640-84F9-D459A33B33A8}.Release_GDK|Win32.Build.0 = Release_GDK|Win32
-		{EA036190-0950-4640-84F9-D459A33B33A8}.Release_GDK|x64.ActiveCfg = Release|x64
-		{EA036190-0950-4640-84F9-D459A33B33A8}.Release_GDK|x64.Build.0 = Release|x64
+		{EA036190-0950-4640-84F9-D459A33B33A8}.Release_GDK|Win32.ActiveCfg = Release_GDK|Win32

+		{EA036190-0950-4640-84F9-D459A33B33A8}.Release_GDK|Win32.Build.0 = Release_GDK|Win32

+		{EA036190-0950-4640-84F9-D459A33B33A8}.Release_GDK|x64.ActiveCfg = Release_GDK|x64

+		{EA036190-0950-4640-84F9-D459A33B33A8}.Release_GDK|x64.Build.0 = Release_GDK|x64

 		{EA036190-0950-4640-84F9-D459A33B33A8}.Release|Win32.ActiveCfg = Release|Win32

 		{EA036190-0950-4640-84F9-D459A33B33A8}.Release|Win32.Build.0 = Release|Win32

 		{EA036190-0950-4640-84F9-D459A33B33A8}.Release|x64.ActiveCfg = Release|x64

 		{EA036190-0950-4640-84F9-D459A33B33A8}.Release|x64.Build.0 = Release|x64

-		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug_GDK|x64.Build.0 = Debug|x64
+		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug_GDK|x64.Build.0 = Debug|x64

 		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug|Win32.ActiveCfg = Debug|Win32

 		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug|Win32.Build.0 = Debug|Win32

 		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug|x64.ActiveCfg = Debug|x64

 		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug|x64.Build.0 = Debug|x64

-		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Release_GDK|Win32.Build.0 = Release|Win32
-		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Release_GDK|x64.ActiveCfg = Release|x64
-		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Release_GDK|x64.Build.0 = Release|x64
+		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Release_GDK|Win32.Build.0 = Release|Win32

+		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Release_GDK|x64.ActiveCfg = Release|x64

+		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Release_GDK|x64.Build.0 = Release|x64

 		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Release|Win32.ActiveCfg = Release|Win32

 		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Release|Win32.Build.0 = Release|Win32

 		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Release|x64.ActiveCfg = Release|x64

 		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Release|x64.Build.0 = Release|x64

-		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug_GDK|x64.Build.0 = Debug|x64
+		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug_GDK|x64.Build.0 = Debug|x64

 		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug|Win32.ActiveCfg = Debug|Win32

 		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug|Win32.Build.0 = Debug|Win32

 		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug|x64.ActiveCfg = Debug|x64

 		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug|x64.Build.0 = Debug|x64

-		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release_GDK|Win32.Build.0 = Release|Win32
-		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release_GDK|x64.ActiveCfg = Release|x64
-		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release_GDK|x64.Build.0 = Release|x64
+		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release_GDK|Win32.Build.0 = Release|Win32

+		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release_GDK|x64.ActiveCfg = Release|x64

+		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release_GDK|x64.Build.0 = Release|x64

 		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release|Win32.ActiveCfg = Release|Win32

 		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release|Win32.Build.0 = Release|Win32

 		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release|x64.ActiveCfg = Release|x64

 		{0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release|x64.Build.0 = Release|x64

-		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug_GDK|x64.Build.0 = Debug|x64
+		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug_GDK|x64.Build.0 = Debug|x64

 		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug|Win32.ActiveCfg = Debug|Win32

 		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug|Win32.Build.0 = Debug|Win32

 		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug|x64.ActiveCfg = Debug|x64

 		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug|x64.Build.0 = Debug|x64

-		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Release_GDK|Win32.Build.0 = Release|Win32
-		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Release_GDK|x64.ActiveCfg = Release|x64
-		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Release_GDK|x64.Build.0 = Release|x64
+		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Release_GDK|Win32.Build.0 = Release|Win32

+		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Release_GDK|x64.ActiveCfg = Release|x64

+		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Release_GDK|x64.Build.0 = Release|x64

 		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Release|Win32.ActiveCfg = Release|Win32

 		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Release|Win32.Build.0 = Release|Win32

 		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Release|x64.ActiveCfg = Release|x64

 		{B8849C58-6773-453C-A2E5-00F02EE20B18}.Release|x64.Build.0 = Release|x64

-		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug_GDK|x64.Build.0 = Debug|x64
+		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug_GDK|x64.Build.0 = Debug|x64

 		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug|Win32.ActiveCfg = Debug|Win32

 		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug|Win32.Build.0 = Debug|Win32

 		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug|x64.ActiveCfg = Debug|x64

 		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug|x64.Build.0 = Debug|x64

-		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release_GDK|Win32.Build.0 = Release|Win32
-		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release_GDK|x64.ActiveCfg = Release|x64
-		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release_GDK|x64.Build.0 = Release|x64
+		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release_GDK|Win32.Build.0 = Release|Win32

+		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release_GDK|x64.ActiveCfg = Release|x64

+		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release_GDK|x64.Build.0 = Release|x64

 		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release|Win32.ActiveCfg = Release|Win32

 		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release|Win32.Build.0 = Release|Win32

 		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release|x64.ActiveCfg = Release|x64

 		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release|x64.Build.0 = Release|x64

-		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug_GDK|x64.Build.0 = Debug|x64
+		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug_GDK|x64.Build.0 = Debug|x64

 		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug|Win32.ActiveCfg = Debug|Win32

 		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug|Win32.Build.0 = Debug|Win32

 		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug|x64.ActiveCfg = Debug|x64

 		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug|x64.Build.0 = Debug|x64

-		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release_GDK|Win32.Build.0 = Release|Win32
-		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release_GDK|x64.ActiveCfg = Release|x64
-		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release_GDK|x64.Build.0 = Release|x64
+		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release_GDK|Win32.Build.0 = Release|Win32

+		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release_GDK|x64.ActiveCfg = Release|x64

+		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release_GDK|x64.Build.0 = Release|x64

 		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release|Win32.ActiveCfg = Release|Win32

 		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release|Win32.Build.0 = Release|Win32

 		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release|x64.ActiveCfg = Release|x64

 		{F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release|x64.Build.0 = Release|x64

-		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug_GDK|x64.Build.0 = Debug|x64
+		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug_GDK|x64.Build.0 = Debug|x64

 		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|Win32.ActiveCfg = Debug|Win32

 		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|Win32.Build.0 = Debug|Win32

 		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|x64.ActiveCfg = Debug|x64

 		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|x64.Build.0 = Debug|x64

-		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release_GDK|Win32.Build.0 = Release|Win32
-		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release_GDK|x64.ActiveCfg = Release|x64
-		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release_GDK|x64.Build.0 = Release|x64
+		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release_GDK|Win32.Build.0 = Release|Win32

+		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release_GDK|x64.ActiveCfg = Release|x64

+		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release_GDK|x64.Build.0 = Release|x64

 		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|Win32.ActiveCfg = Release|Win32

 		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|Win32.Build.0 = Release|Win32

 		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|x64.ActiveCfg = Release|x64

 		{8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|x64.Build.0 = Release|x64

-		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug_GDK|x64.Build.0 = Debug|x64
+		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug_GDK|x64.Build.0 = Debug|x64

 		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|Win32.ActiveCfg = Debug|Win32

 		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|Win32.Build.0 = Debug|Win32

 		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|x64.ActiveCfg = Debug|x64

 		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|x64.Build.0 = Debug|x64

-		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release_GDK|Win32.Build.0 = Release|Win32
-		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release_GDK|x64.ActiveCfg = Release|x64
-		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release_GDK|x64.Build.0 = Release|x64
+		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release_GDK|Win32.Build.0 = Release|Win32

+		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release_GDK|x64.ActiveCfg = Release|x64

+		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release_GDK|x64.Build.0 = Release|x64

 		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|Win32.ActiveCfg = Release|Win32

 		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|Win32.Build.0 = Release|Win32

 		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|x64.ActiveCfg = Release|x64

 		{0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|x64.Build.0 = Release|x64

-		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug_GDK|x64.Build.0 = Debug|x64
+		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug_GDK|x64.Build.0 = Debug|x64

 		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|Win32.ActiveCfg = Debug|Win32

 		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|Win32.Build.0 = Debug|Win32

 		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|x64.ActiveCfg = Debug|x64

 		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|x64.Build.0 = Debug|x64

-		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release_GDK|Win32.Build.0 = Release|Win32
-		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release_GDK|x64.ActiveCfg = Release|x64
-		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release_GDK|x64.Build.0 = Release|x64
+		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release_GDK|Win32.Build.0 = Release|Win32

+		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release_GDK|x64.ActiveCfg = Release|x64

+		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release_GDK|x64.Build.0 = Release|x64

 		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|Win32.ActiveCfg = Release|Win32

 		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|Win32.Build.0 = Release|Win32

 		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|x64.ActiveCfg = Release|x64

 		{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|x64.Build.0 = Release|x64

-		{011F9197-F986-44BD-A8F2-045C746B1B70}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{011F9197-F986-44BD-A8F2-045C746B1B70}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{011F9197-F986-44BD-A8F2-045C746B1B70}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{011F9197-F986-44BD-A8F2-045C746B1B70}.Debug_GDK|x64.Build.0 = Debug|x64
+		{011F9197-F986-44BD-A8F2-045C746B1B70}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{011F9197-F986-44BD-A8F2-045C746B1B70}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{011F9197-F986-44BD-A8F2-045C746B1B70}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{011F9197-F986-44BD-A8F2-045C746B1B70}.Debug_GDK|x64.Build.0 = Debug|x64

 		{011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|Win32.ActiveCfg = Debug|Win32

 		{011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|Win32.Build.0 = Debug|Win32

 		{011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|x64.ActiveCfg = Debug|x64

 		{011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|x64.Build.0 = Debug|x64

-		{011F9197-F986-44BD-A8F2-045C746B1B70}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{011F9197-F986-44BD-A8F2-045C746B1B70}.Release_GDK|Win32.Build.0 = Release|Win32
-		{011F9197-F986-44BD-A8F2-045C746B1B70}.Release_GDK|x64.ActiveCfg = Release|x64
-		{011F9197-F986-44BD-A8F2-045C746B1B70}.Release_GDK|x64.Build.0 = Release|x64
+		{011F9197-F986-44BD-A8F2-045C746B1B70}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{011F9197-F986-44BD-A8F2-045C746B1B70}.Release_GDK|Win32.Build.0 = Release|Win32

+		{011F9197-F986-44BD-A8F2-045C746B1B70}.Release_GDK|x64.ActiveCfg = Release|x64

+		{011F9197-F986-44BD-A8F2-045C746B1B70}.Release_GDK|x64.Build.0 = Release|x64

 		{011F9197-F986-44BD-A8F2-045C746B1B70}.Release|Win32.ActiveCfg = Release|Win32

 		{011F9197-F986-44BD-A8F2-045C746B1B70}.Release|Win32.Build.0 = Release|Win32

 		{011F9197-F986-44BD-A8F2-045C746B1B70}.Release|x64.ActiveCfg = Release|x64

 		{011F9197-F986-44BD-A8F2-045C746B1B70}.Release|x64.Build.0 = Release|x64

-		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug_GDK|x64.Build.0 = Debug|x64
+		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug_GDK|x64.Build.0 = Debug|x64

 		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|Win32.ActiveCfg = Debug|Win32

 		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|Win32.Build.0 = Debug|Win32

 		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|x64.ActiveCfg = Debug|x64

 		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|x64.Build.0 = Debug|x64

-		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release_GDK|Win32.Build.0 = Release|Win32
-		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release_GDK|x64.ActiveCfg = Release|x64
-		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release_GDK|x64.Build.0 = Release|x64
+		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release_GDK|Win32.Build.0 = Release|Win32

+		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release_GDK|x64.ActiveCfg = Release|x64

+		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release_GDK|x64.Build.0 = Release|x64

 		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|Win32.ActiveCfg = Release|Win32

 		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|Win32.Build.0 = Release|Win32

 		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|x64.ActiveCfg = Release|x64

 		{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|x64.Build.0 = Release|x64

-		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug_GDK|x64.Build.0 = Debug|x64
+		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug_GDK|x64.Build.0 = Debug|x64

 		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|Win32.ActiveCfg = Debug|Win32

 		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|Win32.Build.0 = Debug|Win32

 		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|x64.ActiveCfg = Debug|x64

 		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|x64.Build.0 = Debug|x64

-		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release_GDK|Win32.Build.0 = Release|Win32
-		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release_GDK|x64.ActiveCfg = Release|x64
-		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release_GDK|x64.Build.0 = Release|x64
+		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release_GDK|Win32.Build.0 = Release|Win32

+		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release_GDK|x64.ActiveCfg = Release|x64

+		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release_GDK|x64.Build.0 = Release|x64

 		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|Win32.ActiveCfg = Release|Win32

 		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|Win32.Build.0 = Release|Win32

 		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|x64.ActiveCfg = Release|x64

 		{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|x64.Build.0 = Release|x64

-		{2035D56A-E748-475F-B3D5-C123BF652143}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{2035D56A-E748-475F-B3D5-C123BF652143}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{2035D56A-E748-475F-B3D5-C123BF652143}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{2035D56A-E748-475F-B3D5-C123BF652143}.Debug_GDK|x64.Build.0 = Debug|x64
+		{2035D56A-E748-475F-B3D5-C123BF652143}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{2035D56A-E748-475F-B3D5-C123BF652143}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{2035D56A-E748-475F-B3D5-C123BF652143}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{2035D56A-E748-475F-B3D5-C123BF652143}.Debug_GDK|x64.Build.0 = Debug|x64

 		{2035D56A-E748-475F-B3D5-C123BF652143}.Debug|Win32.ActiveCfg = Debug|Win32

 		{2035D56A-E748-475F-B3D5-C123BF652143}.Debug|Win32.Build.0 = Debug|Win32

 		{2035D56A-E748-475F-B3D5-C123BF652143}.Debug|x64.ActiveCfg = Debug|x64

 		{2035D56A-E748-475F-B3D5-C123BF652143}.Debug|x64.Build.0 = Debug|x64

-		{2035D56A-E748-475F-B3D5-C123BF652143}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{2035D56A-E748-475F-B3D5-C123BF652143}.Release_GDK|Win32.Build.0 = Release|Win32
-		{2035D56A-E748-475F-B3D5-C123BF652143}.Release_GDK|x64.ActiveCfg = Release|x64
-		{2035D56A-E748-475F-B3D5-C123BF652143}.Release_GDK|x64.Build.0 = Release|x64
+		{2035D56A-E748-475F-B3D5-C123BF652143}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{2035D56A-E748-475F-B3D5-C123BF652143}.Release_GDK|Win32.Build.0 = Release|Win32

+		{2035D56A-E748-475F-B3D5-C123BF652143}.Release_GDK|x64.ActiveCfg = Release|x64

+		{2035D56A-E748-475F-B3D5-C123BF652143}.Release_GDK|x64.Build.0 = Release|x64

 		{2035D56A-E748-475F-B3D5-C123BF652143}.Release|Win32.ActiveCfg = Release|Win32

 		{2035D56A-E748-475F-B3D5-C123BF652143}.Release|Win32.Build.0 = Release|Win32

 		{2035D56A-E748-475F-B3D5-C123BF652143}.Release|x64.ActiveCfg = Release|x64

 		{2035D56A-E748-475F-B3D5-C123BF652143}.Release|x64.Build.0 = Release|x64

-		{27BA2900-A28A-4869-B16D-FBE581A12402}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{27BA2900-A28A-4869-B16D-FBE581A12402}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{27BA2900-A28A-4869-B16D-FBE581A12402}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{27BA2900-A28A-4869-B16D-FBE581A12402}.Debug_GDK|x64.Build.0 = Debug|x64
+		{27BA2900-A28A-4869-B16D-FBE581A12402}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{27BA2900-A28A-4869-B16D-FBE581A12402}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{27BA2900-A28A-4869-B16D-FBE581A12402}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{27BA2900-A28A-4869-B16D-FBE581A12402}.Debug_GDK|x64.Build.0 = Debug|x64

 		{27BA2900-A28A-4869-B16D-FBE581A12402}.Debug|Win32.ActiveCfg = Debug|Win32

 		{27BA2900-A28A-4869-B16D-FBE581A12402}.Debug|Win32.Build.0 = Debug|Win32

 		{27BA2900-A28A-4869-B16D-FBE581A12402}.Debug|x64.ActiveCfg = Debug|x64

 		{27BA2900-A28A-4869-B16D-FBE581A12402}.Debug|x64.Build.0 = Debug|x64

-		{27BA2900-A28A-4869-B16D-FBE581A12402}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{27BA2900-A28A-4869-B16D-FBE581A12402}.Release_GDK|Win32.Build.0 = Release|Win32
-		{27BA2900-A28A-4869-B16D-FBE581A12402}.Release_GDK|x64.ActiveCfg = Release|x64
-		{27BA2900-A28A-4869-B16D-FBE581A12402}.Release_GDK|x64.Build.0 = Release|x64
+		{27BA2900-A28A-4869-B16D-FBE581A12402}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{27BA2900-A28A-4869-B16D-FBE581A12402}.Release_GDK|Win32.Build.0 = Release|Win32

+		{27BA2900-A28A-4869-B16D-FBE581A12402}.Release_GDK|x64.ActiveCfg = Release|x64

+		{27BA2900-A28A-4869-B16D-FBE581A12402}.Release_GDK|x64.Build.0 = Release|x64

 		{27BA2900-A28A-4869-B16D-FBE581A12402}.Release|Win32.ActiveCfg = Release|Win32

 		{27BA2900-A28A-4869-B16D-FBE581A12402}.Release|Win32.Build.0 = Release|Win32

 		{27BA2900-A28A-4869-B16D-FBE581A12402}.Release|x64.ActiveCfg = Release|x64

 		{27BA2900-A28A-4869-B16D-FBE581A12402}.Release|x64.Build.0 = Release|x64

-		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug_GDK|x64.Build.0 = Debug|x64
+		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug_GDK|x64.Build.0 = Debug|x64

 		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug|Win32.ActiveCfg = Debug|Win32

 		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug|Win32.Build.0 = Debug|Win32

 		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug|x64.ActiveCfg = Debug|x64

 		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug|x64.Build.0 = Debug|x64

-		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release_GDK|Win32.Build.0 = Release|Win32
-		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release_GDK|x64.ActiveCfg = Release|x64
-		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release_GDK|x64.Build.0 = Release|x64
+		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release_GDK|Win32.Build.0 = Release|Win32

+		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release_GDK|x64.ActiveCfg = Release|x64

+		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release_GDK|x64.Build.0 = Release|x64

 		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release|Win32.ActiveCfg = Release|Win32

 		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release|Win32.Build.0 = Release|Win32

 		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release|x64.ActiveCfg = Release|x64

 		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release|x64.Build.0 = Release|x64

-		{2D1AD595-270B-4B38-9475-A269E225C10C}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{2D1AD595-270B-4B38-9475-A269E225C10C}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{2D1AD595-270B-4B38-9475-A269E225C10C}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{2D1AD595-270B-4B38-9475-A269E225C10C}.Debug_GDK|x64.Build.0 = Debug|x64
+		{2D1AD595-270B-4B38-9475-A269E225C10C}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{2D1AD595-270B-4B38-9475-A269E225C10C}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{2D1AD595-270B-4B38-9475-A269E225C10C}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{2D1AD595-270B-4B38-9475-A269E225C10C}.Debug_GDK|x64.Build.0 = Debug|x64

 		{2D1AD595-270B-4B38-9475-A269E225C10C}.Debug|Win32.ActiveCfg = Debug|Win32

 		{2D1AD595-270B-4B38-9475-A269E225C10C}.Debug|Win32.Build.0 = Debug|Win32

 		{2D1AD595-270B-4B38-9475-A269E225C10C}.Debug|x64.ActiveCfg = Debug|x64

 		{2D1AD595-270B-4B38-9475-A269E225C10C}.Debug|x64.Build.0 = Debug|x64

-		{2D1AD595-270B-4B38-9475-A269E225C10C}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{2D1AD595-270B-4B38-9475-A269E225C10C}.Release_GDK|Win32.Build.0 = Release|Win32
-		{2D1AD595-270B-4B38-9475-A269E225C10C}.Release_GDK|x64.ActiveCfg = Release|x64
-		{2D1AD595-270B-4B38-9475-A269E225C10C}.Release_GDK|x64.Build.0 = Release|x64
+		{2D1AD595-270B-4B38-9475-A269E225C10C}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{2D1AD595-270B-4B38-9475-A269E225C10C}.Release_GDK|Win32.Build.0 = Release|Win32

+		{2D1AD595-270B-4B38-9475-A269E225C10C}.Release_GDK|x64.ActiveCfg = Release|x64

+		{2D1AD595-270B-4B38-9475-A269E225C10C}.Release_GDK|x64.Build.0 = Release|x64

 		{2D1AD595-270B-4B38-9475-A269E225C10C}.Release|Win32.ActiveCfg = Release|Win32

 		{2D1AD595-270B-4B38-9475-A269E225C10C}.Release|Win32.Build.0 = Release|Win32

 		{2D1AD595-270B-4B38-9475-A269E225C10C}.Release|x64.ActiveCfg = Release|x64

 		{2D1AD595-270B-4B38-9475-A269E225C10C}.Release|x64.Build.0 = Release|x64

-		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug_GDK|x64.Build.0 = Debug|x64
+		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug_GDK|x64.Build.0 = Debug|x64

 		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug|Win32.ActiveCfg = Debug|Win32

 		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug|Win32.Build.0 = Debug|Win32

 		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug|x64.ActiveCfg = Debug|x64

 		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug|x64.Build.0 = Debug|x64

-		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release_GDK|Win32.Build.0 = Release|Win32
-		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release_GDK|x64.ActiveCfg = Release|x64
-		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release_GDK|x64.Build.0 = Release|x64
+		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release_GDK|Win32.Build.0 = Release|Win32

+		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release_GDK|x64.ActiveCfg = Release|x64

+		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release_GDK|x64.Build.0 = Release|x64

 		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release|Win32.ActiveCfg = Release|Win32

 		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release|Win32.Build.0 = Release|Win32

 		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release|x64.ActiveCfg = Release|x64

 		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release|x64.Build.0 = Release|x64

-		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|x64.Build.0 = Debug|x64
+		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|x64.Build.0 = Debug|x64

 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug|Win32.ActiveCfg = Debug|Win32

 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug|Win32.Build.0 = Debug|Win32

 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug|x64.ActiveCfg = Debug|x64

 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug|x64.Build.0 = Debug|x64

-		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|Win32.Build.0 = Release|Win32
-		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|x64.ActiveCfg = Release|x64
-		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|x64.Build.0 = Release|x64
+		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|Win32.Build.0 = Release|Win32

+		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|x64.ActiveCfg = Release|x64

+		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|x64.Build.0 = Release|x64

 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|Win32.ActiveCfg = Release|Win32

 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|Win32.Build.0 = Release|Win32

 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|x64.ActiveCfg = Release|x64

 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|x64.Build.0 = Release|x64

-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|x64.Build.0 = Debug|x64
+		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|x64.Build.0 = Debug|x64

 		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.ActiveCfg = Debug|Win32

 		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.Build.0 = Debug|Win32

 		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.ActiveCfg = Debug|x64

 		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.Build.0 = Debug|x64

-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|Win32.Build.0 = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|x64.ActiveCfg = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|x64.Build.0 = Release|x64
+		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|Win32.Build.0 = Release|Win32

+		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|x64.ActiveCfg = Release|x64

+		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|x64.Build.0 = Release|x64

 		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.ActiveCfg = Release|Win32

 		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.Build.0 = Release|Win32

 		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.ActiveCfg = Release|x64

 		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.Build.0 = Release|x64

-		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|x64.Build.0 = Debug|x64
+		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|Win32.ActiveCfg = Debug|Win32

+		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|Win32.Build.0 = Debug|Win32

+		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|x64.ActiveCfg = Debug|x64

+		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|x64.Build.0 = Debug|x64

 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug|Win32.ActiveCfg = Debug|Win32

 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug|Win32.Build.0 = Debug|Win32

 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug|x64.ActiveCfg = Debug|x64

 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug|x64.Build.0 = Debug|x64

-		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release_GDK|Win32.Build.0 = Release|Win32
-		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release_GDK|x64.ActiveCfg = Release|x64
-		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release_GDK|x64.Build.0 = Release|x64
+		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release_GDK|Win32.ActiveCfg = Release|Win32

+		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release_GDK|Win32.Build.0 = Release|Win32

+		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release_GDK|x64.ActiveCfg = Release|x64

+		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release_GDK|x64.Build.0 = Release|x64

 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|Win32.ActiveCfg = Release|Win32

 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|Win32.Build.0 = Release|Win32

 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|x64.ActiveCfg = Release|x64

 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|x64.Build.0 = Release|x64

-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.Build.0 = Debug|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.ActiveCfg = Debug_GDK|Win32

+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.Build.0 = Debug_GDK|Win32

+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.ActiveCfg = Debug_GDK|x64

+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.Build.0 = Debug_GDK|x64

 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.ActiveCfg = Debug|Win32

 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.Build.0 = Debug|Win32

 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.ActiveCfg = Debug|x64

 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.Build.0 = Debug|x64

-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.Build.0 = Release|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.ActiveCfg = Release|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.Build.0 = Release|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.ActiveCfg = Release_GDK|Win32

+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.Build.0 = Release_GDK|Win32

+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.ActiveCfg = Release_GDK|x64

+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.Build.0 = Release_GDK|x64

 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.ActiveCfg = Release|Win32

 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.Build.0 = Release|Win32

 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.ActiveCfg = Release|x64

diff --git a/build/win32/vs10/clutter.vcxprojin b/build/win32/vs10/clutter.vcxprojin
index 733251c9b..6acf1cda4 100644
--- a/build/win32/vs10/clutter.vcxprojin
+++ b/build/win32/vs10/clutter.vcxprojin
@@ -62,7 +62,7 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)_GDK|$(Platform)'=='Release|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -273,7 +273,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">
     <PreBuildEvent>
-      <Command>$(PreBuildWin)$(PreBuildCmd2)</Command>
+      <Command>$(PreBuildGDK)$(PreBuildCmd2)</Command>
     </PreBuildEvent>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
@@ -332,7 +332,7 @@
   </ItemDefinitionGroup>
     <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">
     <PreBuildEvent>
-      <Command>$(PreBuildWin)$(PreBuildCmd2)</Command>
+      <Command>$(PreBuildGDK)$(PreBuildCmd2)</Command>
     </PreBuildEvent>
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj
index cc987c255..1b1fd2582 100644
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.vcxproj
@@ -5,18 +5,34 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_GDK|Win32">
+      <Configuration>Debug_GDK</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_GDK|x64">
+      <Configuration>Debug_GDK</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_GDK|Win32">
+      <Configuration>Release_GDK</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_GDK|x64">
+      <Configuration>Release_GDK</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{35B2A4AC-7235-4FC7-995D-469D59195041}</ProjectGuid>
@@ -28,19 +44,37 @@
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|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)'=='Debug_GDK|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)'=='Release_GDK|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>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -48,47 +82,89 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="clutter.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter.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="clutter.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter.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="clutter.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter.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="clutter.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">$(GlibEtcInstallRoot)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">$(GlibEtcInstallRoot)\</OutDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'" />
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">$(GlibEtcInstallRoot)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">$(GlibEtcInstallRoot)\</OutDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'" />
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PostBuildEvent>
       <Command>$(ClutterDoInstall)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">
+    <PostBuildEvent>
+      <Command>$(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PreBuildEvent>
       <Command>$(ClutterDoInstall)</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">
+    <PreBuildEvent>
+      <Command>$(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PostBuildEvent>
       <Command>$(ClutterDoInstall)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">
+    <PostBuildEvent>
+      <Command>$(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PreBuildEvent>
       <Command>$(ClutterDoInstall)</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">
+    <PreBuildEvent>
+      <Command>$(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ProjectReference Include="cally-atkcomponent-example.vcxproj">
       <Project>{4b2c0ee0-f1bd-499c-acad-260cf14c352e}</Project>
diff --git a/build/win32/vs9/clutter.sln b/build/win32/vs9/clutter.sln
index e1ac96062..3b527ba46 100644
--- a/build/win32/vs9/clutter.sln
+++ b/build/win32/vs9/clutter.sln
@@ -462,14 +462,14 @@ Global
 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.Build.0 = Debug|x64

 		{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_GDK|Win32.ActiveCfg = Debug|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.Build.0 = Release|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.Build.0 = Debug|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.ActiveCfg = Release|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.Build.0 = Release|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.ActiveCfg = Debug_GDK|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.Build.0 = Debug_GDK|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.ActiveCfg = Release_GDK|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.Build.0 = Release_GDK|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.ActiveCfg = Debug_GDK|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.Build.0 = Debug_GDK|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.ActiveCfg = Release_GDK|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.Build.0 = Release_GDK|x64
 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/build/win32/vs9/clutter.vsprops b/build/win32/vs9/clutter.vsprops
index a3c487f22..ebc7b6d7d 100644
--- a/build/win32/vs9/clutter.vsprops
+++ b/build/win32/vs9/clutter.vsprops
@@ -272,6 +272,14 @@ copy ..\..\..\clutter\cally\cally-util.h $(OutDir)\include\clutter-$(ClutterApiV
 "
 	/>
 	<UserMacro
+		Name="ClutterDoInstallGDK"
+		Value="
+mkdir $(OutDir)\include\clutter-$(ClutterApiVersion)\clutter\gdk&#x0D;&#x0A;
+
+copy ..\..\..\clutter\gdk\clutter-gdk.h $(OutDir)\include\clutter-$(ClutterApiVersion)\clutter\gdk&#x0D;&#x0A;
+			  "
+	/>
+	<UserMacro
 		Name="GenerateClutterDef"
 		Value="
 		       echo EXPORTS &gt; ..\..\..\clutter\clutter.def&#x0D;&#x0A;
diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index 91c4c43fc..69fc1305f 100644
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -31,6 +31,18 @@
 			/>
 		</Configuration>
 		<Configuration
+			Name="Debug_GDK|Win32"
+			InheritedPropertySheets=".\clutter.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="$(ClutterDoInstall) $(ClutterDoInstallGDK)"
+			/>
+		</Configuration>
+		<Configuration
 			Name="Debug|x64"
 			InheritedPropertySheets=".\clutter.vsprops"
 			OutputDirectory="$(GlibEtcInstallRoot)"
@@ -44,6 +56,19 @@
 			/>
 		</Configuration>
 		<Configuration
+			Name="Debug_GDK|x64"
+			InheritedPropertySheets=".\clutter.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			DeleteExtensionsOnClean=""
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="$(ClutterDoInstall) $(ClutterDoInstallGDK)"
+			/>
+		</Configuration>
+		<Configuration
 			Name="Release|Win32"
 			InheritedPropertySheets=".\clutter.vsprops"
 			OutputDirectory="$(GlibEtcInstallRoot)"
@@ -57,6 +82,19 @@
 			/>
 		</Configuration>
 		<Configuration
+			Name="Release_GDK|Win32"
+			InheritedPropertySheets=".\clutter.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="$(ClutterDoInstall) $(ClutterDoInstallGDK)"
+			/>
+		</Configuration>
+		<Configuration
 			Name="Release|x64"
 			InheritedPropertySheets=".\clutter.vsprops"
 			OutputDirectory="$(GlibEtcInstallRoot)"
@@ -70,6 +108,20 @@
 				CommandLine="$(ClutterDoInstall)"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release_GDK|x64"
+			InheritedPropertySheets=".\clutter.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			DeleteExtensionsOnClean=""
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="$(ClutterDoInstall) $(ClutterDoInstallGDK)"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>