Merge branch 'develop' of https://github.com/ChaiScript/ChaiScript into develop

CMakeLists.txt

@@ -163,7 +163,7 @@ if(NOT MULTITHREAD_SUPPORT_ENABLED)
 endif()
 
 if(CMAKE_HOST_UNIX)
-  if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+  if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Haiku")
     list(APPEND LIBS "dl")
   endif()
 

include/chaiscript/language/chaiscript_engine.hpp

@@ -30,7 +30,7 @@
 #include "../dispatchkit/proxy_functions.hpp"
 #include "chaiscript_common.hpp"
 
-#if defined(__linux__) || defined(__unix__) || defined(__APPLE__)
+#if defined(__linux__) || defined(__unix__) || defined(__APPLE__) || defined(__HAIKU__)
 #include <unistd.h>
 #endif