diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2012-08-21 15:26:48 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2012-08-21 15:26:48 +0800 |
| commit | 8f9b9713f2e451376730f08771a2250fa2a2845f (patch) | |
| tree | a6a8754ee3ab692ef22e901720806b09a4b388fc | |
| parent | dffe168f00ef7bf3277ec8b81c7e28bb04fcc66b (diff) | |
| download | clutter-8f9b9713f2e451376730f08771a2250fa2a2845f.tar.gz | |
Visual C++: Don't disable warning C4819
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.
| -rw-r--r-- | build/win32/vs10/README.txt | 7 | ||||
| -rw-r--r-- | build/win32/vs10/clutter.props | 2 | ||||
| -rw-r--r-- | build/win32/vs9/README.txt | 7 | ||||
| -rw-r--r-- | build/win32/vs9/clutter.vsprops | 1 |
4 files changed, 15 insertions, 2 deletions
diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt index a4d578c3d..8cbc7ca53 100644 --- a/build/win32/vs10/README.txt +++ b/build/win32/vs10/README.txt @@ -87,5 +87,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 Clutter 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 Clutter 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/clutter.props b/build/win32/vs10/clutter.props index 006c5dc22..8e0213df5 100644 --- a/build/win32/vs10/clutter.props +++ b/build/win32/vs10/clutter.props @@ -425,7 +425,7 @@ copy $(SolutionDir)Debug\$(Platform)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\l <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\cogl-1.0;$(GlibEtcInstallRoot)\include\json-glib-1.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles> - <DisableSpecificWarnings>4819;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> <AdditionalDependencies>cogl-pango-1.0.lib;cogl-1.0.lib;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 d8b5193c9..36ffb1db9 100644 --- a/build/win32/vs9/README.txt +++ b/build/win32/vs9/README.txt @@ -86,5 +86,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 Clutteron 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 Clutter 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/clutter.vsprops b/build/win32/vs9/clutter.vsprops index b6ed7c8c6..5ab4467f0 100644 --- a/build/win32/vs9/clutter.vsprops +++ b/build/win32/vs9/clutter.vsprops @@ -11,7 +11,6 @@ AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\cogl-1.0;$(GlibEtcInstallRoot)\include\json-glib-1.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include" PreprocessorDefinitions="G_DISABLE_SINGLE_INCLUDES" ForcedIncludeFiles="msvc_recommended_pragmas.h" - DisableSpecificWarnings="4819" /> <Tool Name="VCLinkerTool" |