Commit 59b1daa4 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'MinGW_Fix' into 'master'

Small compilation fix for MINGW64 cross-compilation

See merge request !151
parents 1cb02d94 9856ed02
......@@ -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>
......@@ -64,7 +64,7 @@ int getche() { return ::_getche(); }
} // AS
// ----------------------------------------------------------------- Win32 ----
#elif defined(WIN32)
#elif defined(WIN32) || defined(__MINGW32__)
#include <conio.h>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment