Update Cogl/CoglPango Visual C++ projects

-Reflect the change to the .def file generation from srcdir to object dir.
-Remove unneeded settings

4 files changed, 24 insertions, 28 deletions

diff --git a/build/win32/vs10/cogl-pango.vcxprojin b/build/win32/vs10/cogl-pango.vcxprojin
index 11070a7e..673c07a1 100644
--- a/build/win32/vs10/cogl-pango.vcxprojin
+++ b/build/win32/vs10/cogl-pango.vcxprojin
@@ -88,7 +88,7 @@
 		<Link>
 			<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
-			<ModuleDefinitionFile>..\..\..\cogl-pango\cogl-pango.def</ModuleDefinitionFile>
+			<ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
 			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
@@ -116,7 +116,7 @@
 		<Link>
 			<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
-			<ModuleDefinitionFile>..\..\..\cogl-pango\cogl-pango.def</ModuleDefinitionFile>
+			<ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
 			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
@@ -144,7 +144,7 @@
 		<Link>
 			<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
-			<ModuleDefinitionFile>..\..\..\cogl-pango\cogl-pango.def</ModuleDefinitionFile>
+			<ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
 			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
@@ -171,7 +171,7 @@
 		<Link>
 			<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
-			<ModuleDefinitionFile>..\..\..\cogl-pango\cogl-pango.def</ModuleDefinitionFile>
+			<ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
 			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
diff --git a/build/win32/vs10/cogl.vcxprojin b/build/win32/vs10/cogl.vcxprojin
index 86ffdd23..de173efe 100644
--- a/build/win32/vs10/cogl.vcxprojin
+++ b/build/win32/vs10/cogl.vcxprojin
@@ -149,7 +149,7 @@
 		<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>..\..\..\cogl\cogl.def</ModuleDefinitionFile>
+			<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
 			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
@@ -181,7 +181,7 @@
 		<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>..\..\..\cogl\cogl.def</ModuleDefinitionFile>
+			<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
 			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
@@ -213,7 +213,7 @@
 		<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>..\..\..\cogl\cogl.def</ModuleDefinitionFile>
+			<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
 			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
@@ -245,7 +245,7 @@
 		<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>..\..\..\cogl\cogl.def</ModuleDefinitionFile>
+			<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
 			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
@@ -277,7 +277,7 @@
 		<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>..\..\..\cogl\cogl.def</ModuleDefinitionFile>
+			<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
 			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
@@ -311,7 +311,7 @@
 		<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>..\..\..\cogl\cogl.def</ModuleDefinitionFile>
+			<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
 			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
@@ -342,7 +342,7 @@
 		<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>..\..\..\cogl\cogl.def</ModuleDefinitionFile>
+			<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
 			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
@@ -373,7 +373,7 @@
 		<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>..\..\..\cogl\cogl.def</ModuleDefinitionFile>
+			<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
 			<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
diff --git a/build/win32/vs9/cogl-pango.vcprojin b/build/win32/vs9/cogl-pango.vcprojin
index b0353dcc..2bc15909 100644
--- a/build/win32/vs9/cogl-pango.vcprojin
+++ b/build/win32/vs9/cogl-pango.vcprojin
@@ -22,7 +22,6 @@
 		<Configuration
 			Name="Debug|Win32"
 			InheritedPropertySheets=".\cogl.vsprops"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\cogl-pango"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -50,7 +49,7 @@
 				AdditionalDependencies="pangocairo-1.0.lib pango-1.0.lib cairo.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\cogl-pango\cogl-pango.def"
+				ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
 				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -60,7 +59,6 @@
 		<Configuration
 			Name="Debug|x64"
 			InheritedPropertySheets=".\cogl.vsprops"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\cogl-pango"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -88,7 +86,7 @@
 				AdditionalDependencies="pangocairo-1.0.lib pango-1.0.lib cairo.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\cogl-pango\cogl-pango.def"
+				ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
 				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -98,7 +96,6 @@
 		<Configuration
 			Name="Release|Win32"
 			InheritedPropertySheets=".\cogl.vsprops"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\cogl-pango"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -127,7 +124,7 @@
 				AdditionalDependencies="pangocairo-1.0.lib pango-1.0.lib cairo.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile="..\..\..\cogl-pango\cogl-pango.def"
+				ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
 				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -139,7 +136,6 @@
 		<Configuration
 			Name="Release|x64"
 			InheritedPropertySheets=".\cogl.vsprops"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\cogl-pango"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -164,7 +160,7 @@
 				AdditionalDependencies="pangocairo-1.0.lib pango-1.0.lib cairo.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\cogl-pango\cogl-pango.def"
+				ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
 				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
diff --git a/build/win32/vs9/cogl.vcprojin b/build/win32/vs9/cogl.vcprojin
index 06403a6e..2fc03af6 100644
--- a/build/win32/vs9/cogl.vcprojin
+++ b/build/win32/vs9/cogl.vcprojin
@@ -53,7 +53,7 @@ $(PreBuildCmd)
 				AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\cogl\cogl.def"
+				ModuleDefinitionFile="$(IntDir)\cogl.def"
 				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -95,7 +95,7 @@ $(PreBuildCmd)
 				AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\cogl\cogl.def"
+				ModuleDefinitionFile="$(IntDir)\cogl.def"
 				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -136,7 +136,7 @@ $(PreBuildCmd)
 				AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\cogl\cogl.def"
+				ModuleDefinitionFile="$(IntDir)\cogl.def"
 				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -178,7 +178,7 @@ $(PreBuildCmd)
 				AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\cogl\cogl.def"
+				ModuleDefinitionFile="$(IntDir)\cogl.def"
 				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -220,7 +220,7 @@ $(PreBuildCmd)
 				AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile="..\..\..\cogl\cogl.def"
+				ModuleDefinitionFile="$(IntDir)\cogl.def"
 				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -265,7 +265,7 @@ $(PreBuildCmd)
 				AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile="..\..\..\cogl\cogl.def"
+				ModuleDefinitionFile="$(IntDir)\cogl.def"
 				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -305,7 +305,7 @@ $(PreBuildCmd)
 				AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\cogl\cogl.def"
+				ModuleDefinitionFile="$(IntDir)\cogl.def"
 				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -346,7 +346,7 @@ $(PreBuildCmd)
 				AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\cogl\cogl.def"
+				ModuleDefinitionFile="$(IntDir)\cogl.def"
 				ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"