Update Visual C++ 2008 projects

-Enhance optimization by turning on WholeProgramOptimization for all
 Release builds
-Disable IncrementalLinking for all Release builds
-Make sure we are using MultiByte character set, to be consistent across
 the board for all configurations

diff --git a/build/win32/vs9/gailutil.vcproj b/build/win32/vs9/gailutil.vcproj
index 51bd653c38be4da765893de0a0045ceb6747b9d4..d66cb61d30205c98b572a960f244f554cc5e0fa3 100644 (file)
--- a/build/win32/vs9/gailutil.vcproj
+++ b/build/win32/vs9/gailutil.vcproj
@@ -23,7 +23,7 @@
                        Name="Debug|Win32"\r
                        InheritedPropertySheets=".\gtk+.vsprops"\r
                        ConfigurationType="2"\r
-                       CharacterSet="1"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -42,7 +42,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                AdditionalDependencies="atk-1.0.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
                                GenerateDebugInformation="true"\r
@@ -77,7 +77,7 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="atk-1.0.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -89,7 +89,7 @@
                        Name="Release|Win32"\r
                        InheritedPropertySheets=".\gtk+.vsprops"\r
                        ConfigurationType="2"\r
-                       CharacterSet="1"\r
+                       CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -126,6 +126,7 @@
                        InheritedPropertySheets=".\gtk+.vsprops"\r
                        ConfigurationType="2"\r
                        CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -143,7 +144,7 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="atk-1.0.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r

diff --git a/build/win32/vs9/gdk-win32.vcproj b/build/win32/vs9/gdk-win32.vcproj
index 14ee06c2686c9287cb50edd23b97fe03f316eb34..f43715a1413e9b5ff5fa1dbcaa3f257f7dd4ca6a 100644 (file)
--- a/build/win32/vs9/gdk-win32.vcproj
+++ b/build/win32/vs9/gdk-win32.vcproj
@@ -46,6 +46,7 @@
                        InheritedPropertySheets=".\gtk+.vsprops"\r
                        ConfigurationType="4"\r
                        CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -87,6 +88,7 @@
                        InheritedPropertySheets=".\gtk+.vsprops"\r
                        ConfigurationType="4"\r
                        CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r

diff --git a/build/win32/vs9/gdk.vcprojin b/build/win32/vs9/gdk.vcprojin
index 6c36dbae7b60e734e03c18f7ff5af3e0ae703bac..e41cd7c20fa9424409bff1f9231827a8c8687bc1 100644 (file)
--- a/build/win32/vs9/gdk.vcprojin
+++ b/build/win32/vs9/gdk.vcprojin
@@ -44,7 +44,7 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="imm32.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                ModuleDefinitionFile="$(IntDir)\gdk.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -57,6 +57,7 @@
                        InheritedPropertySheets=".\gtk+.vsprops"\r
                        ConfigurationType="2"\r
                        CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -74,7 +75,7 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="imm32.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                ModuleDefinitionFile="$(IntDir)\gdk.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -109,7 +110,7 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="imm32.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                ModuleDefinitionFile="$(IntDir)\gdk.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -122,6 +123,7 @@
                        InheritedPropertySheets=".\gtk+.vsprops"\r
                        ConfigurationType="2"\r
                        CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -139,7 +141,7 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="imm32.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                ModuleDefinitionFile="$(IntDir)\gdk.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r

diff --git a/build/win32/vs9/gtk.vcprojin b/build/win32/vs9/gtk.vcprojin
index fff2af661b8e1a02310f59719b727ba6958b00dd..db6ffebf5175e6761e18da75eab73bcb2f887ba3 100644 (file)
--- a/build/win32/vs9/gtk.vcprojin
+++ b/build/win32/vs9/gtk.vcprojin
@@ -44,7 +44,7 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                ModuleDefinitionFile="$(IntDir)\gtk.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -57,6 +57,7 @@
                        InheritedPropertySheets=".\gtk+.vsprops"\r
                        ConfigurationType="2"\r
                        CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -74,7 +75,7 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                ModuleDefinitionFile="$(IntDir)\gtk.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -109,7 +110,7 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                ModuleDefinitionFile="$(IntDir)\gtk.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -122,6 +123,7 @@
                        InheritedPropertySheets=".\gtk+.vsprops"\r
                        ConfigurationType="2"\r
                        CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -139,7 +141,7 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                ModuleDefinitionFile="$(IntDir)\gtk.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r

diff --git a/build/win32/vs9/gtk3-demo.vcproj b/build/win32/vs9/gtk3-demo.vcproj
index 265a3ff0264fa59f7845a9ac810f16771c91b8fc..850aebc2eec2ef53d937c6ba0b5e2f54da2dae33 100644 (file)
--- a/build/win32/vs9/gtk3-demo.vcproj
+++ b/build/win32/vs9/gtk3-demo.vcproj
@@ -44,7 +44,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies=""
-                               LinkIncremental="2"
+                               LinkIncremental="1"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                RandomizedBaseAddress="1"
@@ -77,7 +77,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies=""
-                               LinkIncremental="2"
+                               LinkIncremental="1"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                RandomizedBaseAddress="1"

diff --git a/build/win32/vs9/libgail.vcprojin b/build/win32/vs9/libgail.vcprojin
index 6a6ddd43a7d5c8e084a85f9876862b7e5c39b22d..a9dbea6ef2e4ad51e6ed66848929badb8f0d2794 100644 (file)
--- a/build/win32/vs9/libgail.vcprojin
+++ b/build/win32/vs9/libgail.vcprojin
@@ -23,7 +23,7 @@
                        Name="Debug|Win32"\r
                        InheritedPropertySheets=".\gtk+.vsprops"\r
                        ConfigurationType="4"\r
-                       CharacterSet="1"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -67,7 +67,7 @@
                        Name="Release|Win32"\r
                        InheritedPropertySheets=".\gtk+.vsprops"\r
                        ConfigurationType="4"\r
-                       CharacterSet="1"\r
+                       CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -91,6 +91,7 @@
                        InheritedPropertySheets=".\gtk+.vsprops"\r
                        ConfigurationType="4"\r
                        CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r