Changeset 940:64260c0f58eb in lemon-main

Timestamp:

04/07/11 16:57:35 (14 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

941:6660ac776acf, 960:98ddf8d5fda9

Phase:

public

Message:

Better Win CodeBlock?/MinGW support (#418)

• Remove -ansi compilation flag
• Don't include sys/times.h when WIN32 is defined

Files:

• CMakeLists.txt (modified) (1 diff)
• lemon/bits/windows.cc (modified) (1 diff)

CMakeLists.txt

@@ -52 +52 @@
 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")

lemon/bits/windows.cc

@@ -41 +41 @@
 #include <unistd.h>
 #include <ctime>
+#ifndef WIN32
 #include <sys/times.h>
+#endif
 #include <sys/time.h>
 #endif