Visual Studio Projects: Use Custom Build Rules

Use custom build rules to generate the enumeration sources and the .def
files so that the IDE will regenerate those files upon change and
clean them when a clean up request is requested.

6 files changed, 308 insertions, 84 deletions

diff --git a/build/win32/vs10/cogl-pango.vcxproj.filtersin b/build/win32/vs10/cogl-pango.vcxproj.filtersin
index 4e22b74c..48d7d45d 100644
--- a/build/win32/vs10/cogl-pango.vcxproj.filtersin
+++ b/build/win32/vs10/cogl-pango.vcxproj.filtersin
@@ -13,4 +13,7 @@
   <ItemGroup>
 #include "coglpango.vs10.sourcefiles.filters"
   </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\cogl-pango\cogl-pango.symbols"><Filter>Resource Files</Filter></CustomBuild>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/win32/vs10/cogl-pango.vcxprojin b/build/win32/vs10/cogl-pango.vcxprojin
index 22888c11..9698c025 100644
--- a/build/win32/vs10/cogl-pango.vcxprojin
+++ b/build/win32/vs10/cogl-pango.vcxprojin
@@ -82,9 +82,6 @@
 			<WarningLevel>Level3</WarningLevel>
 			<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
 		</ClCompile>
-		<PreLinkEvent>
-			<Command>$(GenerateCoglPangoDef)</Command>
-		</PreLinkEvent>
 		<Link>
 			<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
@@ -110,9 +107,6 @@
 			<WarningLevel>Level3</WarningLevel>
 			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 		</ClCompile>
-		<PreLinkEvent>
-			<Command>$(GenerateCoglPangoDef)</Command>
-		</PreLinkEvent>
 		<Link>
 			<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
@@ -138,9 +132,6 @@
 			<WarningLevel>Level3</WarningLevel>
 			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 		</ClCompile>
-		<PreLinkEvent>
-			<Command>$(GenerateCoglPangoDef)</Command>
-		</PreLinkEvent>
 		<Link>
 			<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
@@ -165,9 +156,6 @@
 			<WarningLevel>Level3</WarningLevel>
 			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 		</ClCompile>
-		<PreLinkEvent>
-			<Command>$(GenerateCoglPangoDef)</Command>
-		</PreLinkEvent>
 		<Link>
 			<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
@@ -184,6 +172,22 @@
 #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>
diff --git a/build/win32/vs10/cogl.vcxproj.filtersin b/build/win32/vs10/cogl.vcxproj.filtersin
index e9529147..963c2388 100644
--- a/build/win32/vs10/cogl.vcxproj.filtersin
+++ b/build/win32/vs10/cogl.vcxproj.filtersin
@@ -29,4 +29,9 @@
     <ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-2d-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
     <ClCompile Include="..\..\..\cogl\driver\gl\cogl-util-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <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
diff --git a/build/win32/vs10/cogl.vcxprojin b/build/win32/vs10/cogl.vcxprojin
index 0b3e2c9a..6121ebca 100644
--- a/build/win32/vs10/cogl.vcxprojin
+++ b/build/win32/vs10/cogl.vcxprojin
@@ -143,9 +143,6 @@
 			<WarningLevel>Level3</WarningLevel>
 			<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
 		</ClCompile>
-		<PreLinkEvent>
-			<Command>$(GenerateCoglDef)</Command>
-		</PreLinkEvent>
 		<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>
@@ -175,9 +172,6 @@
 			<WarningLevel>Level3</WarningLevel>
 			<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
 		</ClCompile>
-		<PreLinkEvent>
-			<Command>$(GenerateCoglSDLDef)</Command>
-		</PreLinkEvent>
 		<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>
@@ -207,9 +201,6 @@
 			<WarningLevel>Level3</WarningLevel>
 			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 		</ClCompile>
-		<PreLinkEvent>
-			<Command>$(GenerateCoglDef)</Command>
-		</PreLinkEvent>
 		<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>
@@ -239,9 +230,6 @@
 			<WarningLevel>Level3</WarningLevel>
 			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 		</ClCompile>
-		<PreLinkEvent>
-			<Command>$(GenerateCoglSDLDef)</Command>
-		</PreLinkEvent>
 		<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>
@@ -271,9 +259,6 @@
 			<WarningLevel>Level3</WarningLevel>
 			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 		</ClCompile>
-		<PreLinkEvent>
-			<Command>$(GenerateCoglDef)</Command>
-		</PreLinkEvent>
 		<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>
@@ -305,9 +290,6 @@
 			<WarningLevel>Level3</WarningLevel>
 			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 		</ClCompile>
-		<PreLinkEvent>
-			<Command>$(GenerateCoglSDLDef)</Command>
-		</PreLinkEvent>
 		<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>
@@ -336,9 +318,6 @@
 			<WarningLevel>Level3</WarningLevel>
 			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 		</ClCompile>
-		<PreLinkEvent>
-			<Command>$(GenerateCoglDef)</Command>
-		</PreLinkEvent>
 		<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>
@@ -367,9 +346,6 @@
 			<WarningLevel>Level3</WarningLevel>
 			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 		</ClCompile>
-		<PreLinkEvent>
-			<Command>$(GenerateCoglSDLDef)</Command>
-		</PreLinkEvent>
 		<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>
@@ -409,6 +385,86 @@
 		<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'">$(GenerateCoglDef)</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'">$(GenerateCoglDef)</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'">$(GenerateCoglDef)</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'">$(GenerateCoglDef)</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" />
diff --git a/build/win32/vs9/cogl-pango.vcprojin b/build/win32/vs9/cogl-pango.vcprojin
index 44bd7f17..d4c7a256 100644
--- a/build/win32/vs9/cogl-pango.vcprojin
+++ b/build/win32/vs9/cogl-pango.vcprojin
@@ -41,10 +41,6 @@
 				DebugInformationFormat="4"
 			/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateCoglPangoDef)"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="pangocairo-1.0.lib pango-1.0.lib cairo.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
@@ -78,10 +74,6 @@
 				DebugInformationFormat="3"
 			/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateCoglPangoDef)"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="pangocairo-1.0.lib pango-1.0.lib cairo.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
@@ -116,10 +108,6 @@
 				DebugInformationFormat="3"
 			/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateCoglPangoDef)"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="pangocairo-1.0.lib pango-1.0.lib cairo.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
@@ -152,10 +140,6 @@
 				DebugInformationFormat="3"
 			/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateCoglPangoDef)"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="pangocairo-1.0.lib pango-1.0.lib cairo.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
@@ -186,6 +170,36 @@
 			>
 		</Filter>
 		<Filter Name="Resource Files">
+			<File RelativePath="..\..\..\cogl-pango\cogl-pango.symbols">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating $(IntDir)\cogl-pango.def"
+						CommandLine="$(GenerateCoglPangoDef)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\cogl-pango.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating $(IntDir)\cogl-pango.def"
+						CommandLine="$(GenerateCoglPangoDef)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\cogl-pango.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating $(IntDir)\cogl-pango.def"
+						CommandLine="$(GenerateCoglPangoDef)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\cogl-pango.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating $(IntDir)\cogl-pango.def"
+						CommandLine="$(GenerateCoglPangoDef)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\cogl-pango.def"
+					/>
+				</FileConfiguration>
+			</File>
 			<File RelativePath="..\..\..\cogl-pango\cogl-pango.rc" />
 		</Filter>
 	</Files>
diff --git a/build/win32/vs9/cogl.vcprojin b/build/win32/vs9/cogl.vcprojin
index 5469713b..f5002a04 100644
--- a/build/win32/vs9/cogl.vcprojin
+++ b/build/win32/vs9/cogl.vcprojin
@@ -45,10 +45,6 @@ $(PreBuildCmd)
 				DebugInformationFormat="4"
 			/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateCoglDef)"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
@@ -87,10 +83,6 @@ $(PreBuildCmd)
 				DebugInformationFormat="4"
 			/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateCoglSDLDef)"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
@@ -128,10 +120,6 @@ $(PreBuildCmd)
 				DebugInformationFormat="3"
 			/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateCoglDef)"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
@@ -170,10 +158,6 @@ $(PreBuildCmd)
 				DebugInformationFormat="3"
 			/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateCoglSDLDef)"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
@@ -212,10 +196,6 @@ $(PreBuildCmd)
 				DebugInformationFormat="3"
 			/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateCoglDef)"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
@@ -257,10 +237,6 @@ $(PreBuildCmd)
 				DebugInformationFormat="3"
 			/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateCoglSDLDef)"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
@@ -297,10 +273,6 @@ $(PreBuildCmd)
 				DebugInformationFormat="3"
 			/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateCoglDef)"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
@@ -338,10 +310,6 @@ $(PreBuildCmd)
 				DebugInformationFormat="3"
 			/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateCoglSDLDef)"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
@@ -396,6 +364,180 @@ $(PreBuildCmd)
 			>
 		</Filter>
 		<Filter Name="Resource Files">
+			<File RelativePath="..\..\..\cogl\cogl.symbols">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating $(IntDir)\cogl.def"
+						CommandLine="$(GenerateCoglDef)"
+						Outputs="$(IntDir)\cogl.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_SDL|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating $(IntDir)\cogl.def"
+						CommandLine="$(GenerateCoglSDLDef)"
+						Outputs="$(IntDir)\cogl.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating $(IntDir)\cogl.def"
+						CommandLine="$(GenerateCoglDef)"
+						Outputs="$(IntDir)\cogl.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_SDL|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating $(IntDir)\cogl.def"
+						CommandLine="$(GenerateCoglSDLDef)"
+						Outputs="$(IntDir)\cogl.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating $(IntDir)\cogl.def"
+						CommandLine="$(GenerateCoglDef)"
+						Outputs="$(IntDir)\cogl.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_SDL|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating $(IntDir)\cogl.def"
+						CommandLine="$(GenerateCoglSDLDef)"
+						Outputs="$(IntDir)\cogl.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating $(IntDir)\cogl.def"
+						CommandLine="$(GenerateCoglDef)"
+						Outputs="$(IntDir)\cogl.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_SDL|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating $(IntDir)\cogl.def"
+						CommandLine="$(GenerateCoglSDLDef)"
+						Outputs="$(IntDir)\cogl.def"
+					/>
+				</FileConfiguration>
+			</File>
+			<File RelativePath="..\..\..\cogl\cogl-enum-types.h.in">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl\cogl-enum-types.h"
+						CommandLine="$(GenCoglEnumsH)"
+						Outputs="..\..\..\cogl\cogl-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_SDL|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl\cogl-enum-types.h"
+						CommandLine="$(GenCoglEnumsH)"
+						Outputs="..\..\..\cogl\cogl-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl\cogl-enum-types.h"
+						CommandLine="$(GenCoglEnumsH)"
+						Outputs="..\..\..\cogl\cogl-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_SDL|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl\cogl-enum-types.h"
+						CommandLine="$(GenCoglEnumsH)"
+						Outputs="..\..\..\cogl\cogl-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl\cogl-enum-types.h"
+						CommandLine="$(GenCoglEnumsH)"
+						Outputs="..\..\..\cogl\cogl-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_SDL|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl\cogl-enum-types.h"
+						CommandLine="$(GenCoglEnumsH)"
+						Outputs="..\..\..\cogl\cogl-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl\cogl-enum-types.h"
+						CommandLine="$(GenCoglEnumsH)"
+						Outputs="..\..\..\cogl\cogl-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_SDL|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl\cogl-enum-types.h"
+						CommandLine="$(GenCoglEnumsH)"
+						Outputs="..\..\..\cogl\cogl-enum-types.h"
+					/>
+				</FileConfiguration>
+			</File>
+			<File RelativePath="..\..\..\cogl\cogl-enum-types.c.in">
+				<FileConfiguration Name="Debug|Win32">
+				<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl\cogl-enum-types.c"
+						CommandLine="$(GenCoglEnumsC)"
+						Outputs="..\..\..\cogl\cogl-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_SDL|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl\cogl-enum-types.c"
+						CommandLine="$(GenCoglEnumsC)"
+						Outputs="..\..\..\cogl\cogl-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl\cogl-enum-types.c"
+						CommandLine="$(GenCoglEnumsC)"
+						Outputs="..\..\..\cogl\cogl-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_SDL|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl\cogl-enum-types.c"
+						CommandLine="$(GenCoglEnumsC)"
+						Outputs="..\..\..\cogl\cogl-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl\cogl-enum-types.c"
+						CommandLine="$(GenCoglEnumsC)"
+						Outputs="..\..\..\cogl\cogl-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_SDL|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl\cogl-enum-types.c"
+						CommandLine="$(GenCoglEnumsC)"
+						Outputs="..\..\..\cogl\cogl-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl\cogl-enum-types.c"
+						CommandLine="$(GenCoglEnumsC)"
+						Outputs="..\..\..\cogl\cogl-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_SDL|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl\cogl-enum-types.c"
+						CommandLine="$(GenCoglEnumsC)"
+						Outputs="..\..\..\cogl\cogl-enum-types.c"
+					/>
+				</FileConfiguration>
+			</File>
 			<File RelativePath="..\..\..\cogl\cogl.rc" />
 		</Filter>
 	</Files>