From 9856ed02a0d6a3f51dc0876028841d5938fd0325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Fri, 26 Jan 2018 13:33:24 +0100 Subject: [PATCH] Small compilation fix for MINGW64 cross-compilation --- Doc/changelog.docu | 1 + src/OpenMesh/Tools/Utils/conio.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Doc/changelog.docu b/Doc/changelog.docu index 9aff8b23..9a8271d4 100644 --- a/Doc/changelog.docu +++ b/Doc/changelog.docu @@ -32,6 +32,7 @@
  • enable c++11 features of many classes for Visual Studio 2013
  • Fixed broken version macros (Thanks to Frederik Salomonsson for the fix)
  • Fixed Build on gcc-7.2 (Thanks to Gero Müller and Martial Tola for the patches)
  • +
  • Small compilation fix for MINGW64 cross-compilation(Thanks to Manuel Massing for the patch)
  • Tools diff --git a/src/OpenMesh/Tools/Utils/conio.cc b/src/OpenMesh/Tools/Utils/conio.cc index 5459dcde..985fbddb 100644 --- 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