Merge pull request #3 from Alexpux/master

Fixes for mingw builds
RigsOfRods · Feb 8, 2019 · 7df4e54 · 7df4e54
2 parents 1dd7a14 + 3202276
commit 7df4e54
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,7 +49,7 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${RUNTIME_OUTPUT_DIRECTORY})
 
 
 # some optimization flags
-if(WIN32)
+if(MSVC)
   # add multi processor compilation flags
   set(CMAKE_CXX_FLAGS_RELEASE        "${CMAKE_CXX_FLAGS_RELEASE}        /MP /GL /Ox /Ob2 /Oi /Ot /Oy /fp:fast /GS- /MP /Zi")
   set(CMAKE_CXX_FLAGS_MINSIZEREL     "${CMAKE_CXX_FLAGS_MINSIZEREL}     /MP /Zi")
@@ -63,10 +63,10 @@ if(WIN32)
   set(CMAKE_EXE_LINKER_FLAGS_RELEASE        "${CMAKE_EXE_LINKER_FLAGS_RELEASE}        /DEBUG /SUBSYSTEM:WINDOWS /LTCG /OPT:REF")
   set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL     "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL}     /DEBUG /SUBSYSTEM:WINDOWS /LTCG /OPT:REF")
   set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /SUBSYSTEM:WINDOWS /LTCG /OPT:REF")
-ELSEIF(UNIX)
+ELSEIF()
   set(CMAKE_EXE_LINKER_FLAGS_RELEASE      "${CMAKE_EXE_LINKER_FLAGS_RELEASE}      -mfpmath=sse -msse2 -mmmx -msse -msse3 -m3dnow -O2 -fomit-frame-pointer -fstrict-aliasing -ffast-math -ftracer")
   set(CMAKE_EXE_LINKER_FLAGS_RelWithDebug "${CMAKE_EXE_LINKER_FLAGS_RelWithDebug} -O0")
-endif(WIN32)
+endif()
 
 # some PG build options
 set(PAGEDGEOMETRY_BUILD_SAMPLES         "FALSE" CACHE BOOL "build the examples")

diff --git a/include/RandomTable.h b/include/RandomTable.h
@@ -16,6 +16,10 @@ Permission is granted to anyone to use this software for any purpose, including
 
 #include <time.h> // for time
 #include "MersenneTwister.h"
+#ifdef _WIN32
+#define _WIN32_WINNT 0x0600
+#include <windows.h>
+#endif
 
 // random table class that speeds up PG a bit
 class RandomTable