diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2013-09-10 16:18:15 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2013-09-10 16:18:15 +0800 |
| commit | 142c1bbee7b46cf390eb375149da618a466f56bb (patch) | |
| tree | 7eb56cf10058d5764da5aef3f26322463a9bd1ad | |
| parent | ac70bd3503ee7adc9bf6938353e25e81e852bfaf (diff) | |
| download | clutter-142c1bbee7b46cf390eb375149da618a466f56bb.tar.gz | |
MSVC Builds: Silence Cogl Deprecation Warnings
Cogl-1.16 has much deprecation that is done, which causes the build of
Clutter to generate lots of C4996 (deprecation) warnings. As in commit
fa8809d7 (Add COGL_DISABLE_DEPRECATION_WARNINGS to the build flags), do
likewise by adding this macro in the Visual C++ property sheets, so we
would have much less C4996 warnings during the build.
Please see bug 703877 for the rationale behind this.
| -rw-r--r-- | build/win32/vs10/clutter.props | 2 | ||||
| -rw-r--r-- | build/win32/vs9/clutter.vsprops | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/win32/vs10/clutter.props b/build/win32/vs10/clutter.props index 3bf3d89c3..bfdb92a80 100644 --- a/build/win32/vs10/clutter.props +++ b/build/win32/vs10/clutter.props @@ -11,7 +11,7 @@ <LibBuildDefines>HAVE_CONFIG_H;CLUTTER_COMPILATION;COGL_ENABLE_EXPERIMENTAL_API;COGL_HAS_WIN32_SUPPORT;CLUTTER_ENABLE_EXPERIMENTAL_API</LibBuildDefines> <DebugLibBuildDefines>$(LibBuildDefines);_DEBUG;CLUTTER_ENABLE_DEBUG</DebugLibBuildDefines> <ReleaseLibBuildDefines>$(LibBuildDefines);G_DISABLE_ASSERT;G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS</ReleaseLibBuildDefines> - <ClutterBuildDefines>$(BaseBuildDef);G_LOG_DOMAIN="Clutter";CLUTTER_LOCALEDIR="../share/locale";CLUTTER_SYSCONFDIR="../etc"</ClutterBuildDefines> + <ClutterBuildDefines>$(BaseBuildDef);G_LOG_DOMAIN="Clutter";CLUTTER_LOCALEDIR="../share/locale";CLUTTER_SYSCONFDIR="../etc";COGL_DISABLE_DEPRECATION_WARNINGS</ClutterBuildDefines> <ClutterDisableDeprecationWarnings>CLUTTER_DISABLE_DEPRECATION_WARNINGS;GLIB_DISABLE_DEPRECATION_WARNINGS</ClutterDisableDeprecationWarnings> <CallyTestDefs>$(BaseWinBuildDef);PREFIXDIR="/some/dummy/dir";$(ClutterDisableDeprecationWarnings)</CallyTestDefs> <TestProgDef>$(BaseBuildDef);TESTS_DATADIR="../share/clutter-$(ApiVersion)/data"</TestProgDef> diff --git a/build/win32/vs9/clutter.vsprops b/build/win32/vs9/clutter.vsprops index 2b35c755b..4b5754f5b 100644 --- a/build/win32/vs9/clutter.vsprops +++ b/build/win32/vs9/clutter.vsprops @@ -59,7 +59,7 @@ /> <UserMacro Name="ClutterBuildDefines" - Value="$(BaseBuildDef);G_LOG_DOMAIN=\"Clutter\";CLUTTER_LOCALEDIR=\"../share/locale\";CLUTTER_SYSCONFDIR=\"../etc\"" + Value="$(BaseBuildDef);G_LOG_DOMAIN=\"Clutter\";CLUTTER_LOCALEDIR=\"../share/locale\";CLUTTER_SYSCONFDIR=\"../etc\";COGL_DISABLE_DEPRECATION_WARNINGS" /> <UserMacro Name="ClutterDisableDeprecationWarnings" |