[cogl/wip/rib/cogl-1.12: 108/139] Visual C++ support: Re-enable C4819 warnings

[Robert Bragg <rbragg src gnome org>]

commit d559c93f8cbdbc89b00a1f7d85c4499a491d346c
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Jul 20 15:51:21 2012 +0800

    Visual C++ support: Re-enable C4819 warnings
    
    The C4819 warnings appear due to a bug on Visual C++ when running on
    non-English locales, specifically CJK versions/locales of Windows.
    
    Re-enable this, like what is done in GLib, and add a note in the Visual
    C++ README.txt's to tell people about this, so that Cogl will be built
    correctly.
    
    (cherry picked from commit a93eafe6596e3b262dbb86f24a456e53b044055a)

 build/win32/vs10/README.txt  |    7 +++++++
 build/win32/vs10/cogl.props  |    2 +-
 build/win32/vs9/README.txt   |    7 +++++++
 build/win32/vs9/cogl.vsprops |    1 -
 4 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt
index e291430..72e25b0 100644
--- a/build/win32/vs10/README.txt
+++ b/build/win32/vs10/README.txt
@@ -69,5 +69,12 @@ built DLLs go into <root>\vs10\<PlatformName>\bin, built LIBs into
  ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit)
  ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit)
 
+Note: If you see C4819 warnings and you are compiling Cogl on a DBCS
+(Chinese/Korean/Japanese) version of Windows, you may need to switch
+to an English locale in Control Panel->Region and Languages->System->
+Change System Locale, reboot and rebuild to ensure Cogl and its
+dependencies are built correctly.  This is due to a bug in Visual C++
+running on DBCS locales.
+
 --Chun-wei Fan <fanc999 yahoo com tw>
   (Adopted from the GTK+ Win32 VS README.txt file originally by Tor Lillqvist)
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
index 09bec4b..3880a50 100644
--- a/build/win32/vs10/cogl.props
+++ b/build/win32/vs10/cogl.props
@@ -227,7 +227,7 @@ copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersio
       <AdditionalIncludeDirectories>..\..\..;..\..\..\cogl;..\..\..\cogl\winsys;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>G_DISABLE_SINGLE_INCLUDES;COGL_HAS_GLIB_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-      <DisableSpecificWarnings>4819;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt
index 09618b0..cd1695d 100644
--- a/build/win32/vs9/README.txt
+++ b/build/win32/vs9/README.txt
@@ -83,5 +83,12 @@ built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into
   ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit)
   ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit)
 
+Note: If you see C4819 warnings and you are compiling Cogl on a DBCS
+(Chinese/Korean/Japanese) version of Windows, you may need to switch
+to an English locale in Control Panel->Region and Languages->System->
+Change System Locale, reboot and rebuild to ensure Cogl and its
+dependencies are built correctly.  This is due to a bug in Visual C++
+running on DBCS locales.
+
 --Chun-wei Fan <fanc999 yahoo com tw>
   (Adopted from the GTK+ Win32 VS README.txt file originally by Tor Lillqvist)
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
index c4af850..81be0c8 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -11,7 +11,6 @@
 		AdditionalIncludeDirectories="..\..\..;..\..\..\cogl;..\..\..\cogl\winsys;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include"
 		PreprocessorDefinitions="G_DISABLE_SINGLE_INCLUDES;COGL_HAS_GLIB_SUPPORT"
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
-		DisableSpecificWarnings="4819"
 	/>
 	<Tool
 		Name="VCLinkerTool"