more msys2 fixes

README.md

@@ -202,8 +202,10 @@ Next, build OpenSCAD and package it to an installer and/or .zip archive:
 
     ./scripts/release-common.sh
 
-If you only want to build openscad.exe, not make a package, then
-skip ahead to the Compilation instructions. 
+If you only want to build openscad.exe, not make a package, then run this
+
+    qmake CONFIG=Release
+    make
 
 ### Cross building
 

src/lexer.l

@@ -39,9 +39,9 @@
 namespace fs = boost::filesystem;
 
 //isatty for visual c++ and mingw-cross-env
-//#if defined __MINGW32__ && ! defined _MSC_VER
-//#include "unistd.h"
-//#endif
+#if defined __MINGW32__ && ! defined _MSC_VER
+#include "unistd.h"
+#endif
 #if defined _MSC_VER
 extern "C" int __cdecl _isatty(int _FileHandle);
 #define isatty _isatty

tests/CMakeLists.txt

@@ -925,8 +925,10 @@ elseif(APPLE)
   set(OPENSCAD_BINPATH "${CMAKE_CURRENT_SOURCE_DIR}/../OpenSCAD.app/Contents/MacOS/OpenSCAD")
 elseif (MINGW_CROSS_ENV_DIR) 
   set(OPENSCAD_BINPATH "${CMAKE_CURRENT_SOURCE_DIR}/../mingw32/release/openscad.exe")
-elseif(WIN32)
+elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../Release/openscad.exe")
   set(OPENSCAD_BINPATH "${CMAKE_CURRENT_SOURCE_DIR}/../Release/openscad.exe")
+elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../bin/openscad.exe")
+  set(OPENSCAD_BINPATH "${CMAKE_CURRENT_SOURCE_DIR}/../bin/openscad.exe")
 elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../bin/openscad")
   set(OPENSCAD_BINPATH "${CMAKE_CURRENT_SOURCE_DIR}/../bin/openscad")
 else()