Merge branch 'master' of github.com:GaijinEntertainment/daScript

CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required (VERSION 3.16)
 project (DAS)
 
+option(DAS_FLEX_BISON_DISABLED "Disable FLEX/BISON stage" OFF)
 option(DAS_CLANG_BIND_DISABLED "Disable dasClangBind (libclang bindings, C/C++ parsing)" OFF)
 option(DAS_HV_DISABLED "Disable dasHV (websokets,http server and client)" OFF)
 option(DAS_GLFW_DISABLED "Disable dasGLFW (GLFW window for graphics apps)" OFF)
@@ -26,7 +27,9 @@ set(EXECUTABLE_OUTPUT_PATH  ${PROJECT_SOURCE_DIR}/bin/)
 
 SET(LINUX_UUID FALSE)
 
-FIND_FLEX_AND_BISON()
+IF(NOT DAS_FLEX_BISON_DISABLED)
+    FIND_FLEX_AND_BISON()
+ENDIF()
 
 SETUP_COMPILER()
 

README.md

@@ -2,7 +2,9 @@
 daScript - high-performance statically strong typed scripting language
 
 Win64 build status [![Build status](https://ci.appveyor.com/api/projects/status/87jho7utcy3d5pcc/branch/master?svg=true)](https://ci.appveyor.com/project/imp5imp5/dascript/branch/master)\
-Linux build status [![Build status](https://ci.appveyor.com/api/projects/status/n2xv2i829xuvjv3g/branch/master?svg=true)](https://ci.appveyor.com/project/imp5imp5/dascript-linux/branch/master)
+Linux build status [![Build status](https://ci.appveyor.com/api/projects/status/n2xv2i829xuvjv3g/branch/master?svg=true)](https://ci.appveyor.com/project/imp5imp5/dascript-linux/branch/master)\
+macOS build status [![Build status](https://ci.appveyor.com/api/projects/status/dk833vli83lko0m4/branch/master?svg=true)](https://ci.appveyor.com/project/imp5imp5/dascript-mac/branch/master)
+
 
 11/26/2021
   * hardware breakpoints are now supported on mac arm64