Merge branch 'MinGW_Fix' into 'master'

Small compilation fix for MINGW64 cross-compilation See merge request OpenMesh/OpenMesh!151
2018-01-26 15:24:30 +01:00
parent 1cb02d946f 9856ed02a0
commit 59b1daa49d
2 changed files with 2 additions and 1 deletions
--- a/Doc/changelog.docu
+++ b/Doc/changelog.docu
@@ -32,6 +32,7 @@
 <li>enable c++11 features of many classes for Visual Studio 2013</li>
 <li>Fixed broken version macros (Thanks to Frederik Salomonsson for the fix)</li>
 <li>Fixed Build on gcc-7.2 (Thanks to Gero Müller and Martial Tola for the patches)</li>
+<li>Small compilation fix for MINGW64 cross-compilation(Thanks to Manuel Massing for the patch)</li>
 </ul>

 <b>Tools</b>
--- a/src/OpenMesh/Tools/Utils/conio.cc
+++ b/src/OpenMesh/Tools/Utils/conio.cc
@@ -64,7 +64,7 @@ int getche() { return ::_getche(); }
 } // AS

 // ----------------------------------------------------------------- Win32 ----
-#elif defined(WIN32)
+#elif defined(WIN32) || defined(__MINGW32__)

 #include <conio.h>