Merge ssh://git.gnome.org/git/gtk+

diff --git a/build/win32/vs9/gdk-win32.vcproj b/build/win32/vs9/gdk-win32.vcproj
index e8d76d0998a18ed53cf2ab1c59b18ac79f394948..ef0fc6e823c85bde61a00895ba4da117cce76e54 100644 (file)
--- a/build/win32/vs9/gdk-win32.vcproj
+++ b/build/win32/vs9/gdk-win32.vcproj
@@ -31,7 +31,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"\r
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"\r
                                PreprocessorDefinitions="_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -52,7 +52,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"\r
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"\r
                                PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -72,7 +72,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"\r
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"\r
                                PreprocessorDefinitions="_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -93,7 +93,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"\r
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"\r
                                PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r

diff --git a/build/win32/vs9/gdk.vcprojin b/build/win32/vs9/gdk.vcprojin
index 71a595363633ca21f591c4154f545bbbec6c33d5..97225431854f08302cec301ed4787b46c89fd6bb 100644 (file)
--- a/build/win32/vs9/gdk.vcprojin
+++ b/build/win32/vs9/gdk.vcprojin
@@ -31,7 +31,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk"\r
+                               AdditionalIncludeDirectories="..\..\..\gdk"\r
                                PreprocessorDefinitions="_DEBUG;$(GdkDefines)"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -63,7 +63,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"\r
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"\r
                                PreprocessorDefinitions="$(GdkDefines)"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -96,7 +96,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"\r
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"\r
                                PreprocessorDefinitions="_DEBUG;$(GdkDefines)"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -128,7 +128,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"\r
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"\r
                                PreprocessorDefinitions="$(GdkDefines)"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r

diff --git a/build/win32/vs9/gtk-demo.vcproj b/build/win32/vs9/gtk-demo.vcproj
index 2077624629160453807749006f0431d36d175ea7..4962a20224c9170861bad4e7122e6f35a69e1709 100644 (file)
--- a/build/win32/vs9/gtk-demo.vcproj
+++ b/build/win32/vs9/gtk-demo.vcproj
@@ -31,7 +31,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"\r
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"\r
                                PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -64,7 +64,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"\r
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"\r
                                PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -97,7 +97,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"\r
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"\r
                                PreprocessorDefinitions="$(GtkPrefixDefine)"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -130,7 +130,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"\r
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"\r
                                PreprocessorDefinitions="$(GtkPrefixDefine)"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r

diff --git a/build/win32/vs9/gtk.vcprojin b/build/win32/vs9/gtk.vcprojin
index 49961cfc175401b2722109db62570036aa4a7816..7f38614e7b81c4176484ad0ab3e77479bb69730e 100644 (file)
--- a/build/win32/vs9/gtk.vcprojin
+++ b/build/win32/vs9/gtk.vcprojin
@@ -31,7 +31,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"\r
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"\r
                                PreprocessorDefinitions="_DEBUG;$(GtkDefines)"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -63,7 +63,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"\r
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"\r
                                PreprocessorDefinitions="$(GtkDefines)"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -96,7 +96,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"\r
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"\r
                                PreprocessorDefinitions="_DEBUG;$(GtkDefines)"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -128,7 +128,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"\r
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"\r
                                PreprocessorDefinitions="$(GtkDefines)"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -137,7 +137,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
+                               AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="$(IntDir)\gtk.def"\r