From 90a63365bd8b5567f1bab5b7320c8a7ebef01e28 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Sun, 20 Jan 2019 14:14:06 +0100 Subject: [PATCH] Don't use threading with chaiscript --- deps/premake/chaiscript.lua | 4 ++++ src/std_include.hpp | 1 + 2 files changed, 5 insertions(+) diff --git a/deps/premake/chaiscript.lua b/deps/premake/chaiscript.lua index f0adca9..6d961b1 100644 --- a/deps/premake/chaiscript.lua +++ b/deps/premake/chaiscript.lua @@ -4,6 +4,10 @@ chaiscript = { function chaiscript.import() chaiscript.includes() + + defines { + "CHAISCRIPT_NO_THREADS" -- :( + } end function chaiscript.includes() diff --git a/src/std_include.hpp b/src/std_include.hpp index fea7add..bbaa8b7 100644 --- a/src/std_include.hpp +++ b/src/std_include.hpp @@ -18,6 +18,7 @@ #include #include #include +#include // min and max is required by gdi, therefore NOMINMAX won't work #ifdef max