# HG changeset patch # User Alpar Juttner # Date 1302188255 -7200 # Node ID 64260c0f58eb25c9bf6563793f7bacbfcc0a14bb # Parent 16d466589b54343660684094593caaa09188c928 Better Win CodeBlock/MinGW support (#418) - Remove -ansi compilation flag - Don't include sys/times.h when WIN32 is defined diff -r 16d466589b54 -r 64260c0f58eb CMakeLists.txt --- a/CMakeLists.txt Wed Aug 25 21:34:58 2010 +0200 +++ b/CMakeLists.txt Thu Apr 07 16:57:35 2011 +0200 @@ -51,7 +51,7 @@ SET(CXX_WARNING $ENV{LEMON_CXX_WARNING}) ELSE() IF(CMAKE_COMPILER_IS_GNUCXX) - SET(CXX_WARNING "-Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas") + SET(CXX_WARNING "-Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas") SET(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "-ggdb") SET(CMAKE_C_FLAGS_DEBUG CACHE STRING "-ggdb") ELSEIF(MSVC) diff -r 16d466589b54 -r 64260c0f58eb lemon/bits/windows.cc --- a/lemon/bits/windows.cc Wed Aug 25 21:34:58 2010 +0200 +++ b/lemon/bits/windows.cc Thu Apr 07 16:57:35 2011 +0200 @@ -40,7 +40,9 @@ #else #include #include +#ifndef WIN32 #include +#endif #include #endif