From c2268b1e9d53d0f4b89328c3649f3f5afae0630d Mon Sep 17 00:00:00 2001 From: Nils Kneuper Date: Sun, 24 Jul 2011 15:10:34 +0000 Subject: [PATCH] since 2011-07-24T12:27:21Z!loonycyborg@gmail.com strict-aliasing should be possible again... ...for the old network code, too, so remove this (now no longer required) flag by default --- CMakeLists.txt | 4 +--- changelog | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 77543459366..c8e3698dfe4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,9 +113,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) if(NOT CONFIGURED) if(ENABLE_STRICT_COMPILATION) - # The current networking code breaks strict aliasing in g++ 4.5. - # Once the code is converted to boost::asio it might be reenabled. - set(STRICT_FLAGS "-Werror -Wno-strict-aliasing") + set(STRICT_FLAGS "-Werror") else(ENABLE_STRICT_COMPILATION) set(STRICT_FLAGS "") endif(ENABLE_STRICT_COMPILATION) diff --git a/changelog b/changelog index ed7ba11813c..70dbac70e3e 100644 --- a/changelog +++ b/changelog @@ -39,6 +39,9 @@ Version 1.9.7+svn: * Fixed bug #18117, saved games with Qatif-al-nar became corrupted * Fixed bug #18120, where Khalifate units were not getting the default ALMA * Patch #2663: Make wesnoth-optipng work on systems with BSD stat + * CMake build system: + * Disabled building of libana by default + * Removed "-Wno-strict-aliasing" from the default compiler flags Version 1.9.7: * Graphics: