Fixed mingw build.

2012-03-15 18:29:06 -04:00 · 2012-03-15 18:29:06 -04:00 · 619163d40e
commit 619163d40e
parent b11c13fb9f
4 changed files with 8 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,5 +12,5 @@ CPackSourceConfig.cmake
 cmake_uninstall.cmake
 CTestTestfile.cmake
 install_manifest.txt
-build
+build*
 Build
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -201,6 +201,10 @@ endif(CMAKE_COMPILER_IS_GNUCXX)

 if(WIN32)

+    if(MINGW)
+        add_definitions(-D_WIN32_WINNT=0x501)
+    endif()
+
    if(MSVC)
        # turn off various warnings
        # foreach(warning 4244 4251 4267 4275 4290 4786 4305 4996)
--- a/simgear/io/test_binobj.cxx
+++ b/simgear/io/test_binobj.cxx
@ -9,7 +9,7 @@
 #include <cstdlib>
 #include <cstdio>

-#ifdef _MSC_VER
+#if defined _MSC_VER || defined _WIN32_WINNT
 #   define  random  rand
 #endif

--- a/simgear/misc/sg_dir.cxx
+++ b/simgear/misc/sg_dir.cxx
@ -23,6 +23,8 @@
 #endif

 #include <simgear/misc/sg_dir.hxx>
+#include <math.h>
+#include <stdlib.h>

 #ifdef _WIN32
 #  define WIN32_LEAN_AND_MEAN