[gtk+] Fix gtk3-demo Visual Studio projects

[Chun-wei Fan <fanchunwei src gnome org>]

commit ed5649a44b2dcfd175549aec203bfabc43092aae
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Feb 27 12:33:42 2013 +0800

    Fix gtk3-demo Visual Studio projects
    
    Since we are linking in the resource items by the source, we need to
    disable WholeProgramOptimization so that the resource stuff does get linked
    into the demo binaries, so that they can be loaded properly.
    
    Also make sure that gtk3-demo-application is also built with the multibyte
    character set, like the rest.
    
    This should fix bug 694342, at least for Visual Studio builds.

 build/win32/vs10/gtk3-demo-application.vcxproj |   16 ++++++++--------
 build/win32/vs10/gtk3-demo.vcxproj             |    6 ++++--
 build/win32/vs9/gtk3-demo-application.vcproj   |   12 ++++++------
 build/win32/vs9/gtk3-demo.vcproj               |    4 ++--
 4 files changed, 20 insertions(+), 18 deletions(-)
---
diff --git a/build/win32/vs10/gtk3-demo-application.vcxproj b/build/win32/vs10/gtk3-demo-application.vcxproj
index 5550650..c48d14b 100644
--- a/build/win32/vs10/gtk3-demo-application.vcxproj
+++ b/build/win32/vs10/gtk3-demo-application.vcxproj
@@ -26,21 +26,21 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -92,7 +92,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
@@ -136,7 +136,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
diff --git a/build/win32/vs10/gtk3-demo.vcxproj b/build/win32/vs10/gtk3-demo.vcxproj
index 86839f0..4e22720 100644
--- a/build/win32/vs10/gtk3-demo.vcxproj
+++ b/build/win32/vs10/gtk3-demo.vcxproj
@@ -27,7 +27,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -38,7 +38,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -135,6 +135,7 @@
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -158,6 +159,7 @@
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
diff --git a/build/win32/vs9/gtk3-demo-application.vcproj b/build/win32/vs9/gtk3-demo-application.vcproj
index f6ba10a..51b90ea 100644
--- a/build/win32/vs9/gtk3-demo-application.vcproj
+++ b/build/win32/vs9/gtk3-demo-application.vcproj
@@ -23,7 +23,7 @@
                        Name="Debug|Win32"
                        InheritedPropertySheets=".\gtk+.vsprops"
                        ConfigurationType="1"
-                       CharacterSet="1"
+                       CharacterSet="2"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -51,8 +51,8 @@
                        Name="Release|Win32"
                        InheritedPropertySheets=".\gtk+.vsprops"
                        ConfigurationType="1"
-                       CharacterSet="1"
-                       WholeProgramOptimization="1"
+                       CharacterSet="2"
+                       WholeProgramOptimization="0"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -82,7 +82,7 @@
                        Name="Debug|x64"
                        InheritedPropertySheets=".\gtk+.vsprops"
                        ConfigurationType="1"
-                       CharacterSet="1"
+                       CharacterSet="2"
                        >
                        <Tool
                                Name="VCMIDLTool"
@@ -111,8 +111,8 @@
                        Name="Release|x64"
                        InheritedPropertySheets=".\gtk+.vsprops"
                        ConfigurationType="1"
-                       CharacterSet="1"
-                       WholeProgramOptimization="1"
+                       CharacterSet="2"
+                       WholeProgramOptimization="0"
                        >
                        <Tool
                                Name="VCMIDLTool"
diff --git a/build/win32/vs9/gtk3-demo.vcproj b/build/win32/vs9/gtk3-demo.vcproj
index 1b01ea3..c2509da 100644
--- a/build/win32/vs9/gtk3-demo.vcproj
+++ b/build/win32/vs9/gtk3-demo.vcproj
@@ -90,7 +90,7 @@
                        ConfigurationType="1"
                        InheritedPropertySheets=".\gtk+.vsprops"
                        CharacterSet="2"
-                       WholeProgramOptimization="1"
+                       WholeProgramOptimization="0"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -123,7 +123,7 @@
                        ConfigurationType="1"
                        InheritedPropertySheets=".\gtk+.vsprops"
                        CharacterSet="2"
-                       WholeProgramOptimization="1"
+                       WholeProgramOptimization="0"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"