From 8cc758355d51920adb7dc5b5899cf5fdca9fbd74 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Thu, 8 Feb 2018 22:06:25 +0100 Subject: Enable use of system-wide asio, glm and rapidjson (#3172) * Fixed building using system utf8proc * Fixed building using system portaudio * Allow using system-wide asio headers (1.11.0 or higher required). * Allow using system-wide glm headers * Allow using system-wide rapidjson headers --- scripts/extlib.lua | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'scripts/extlib.lua') diff --git a/scripts/extlib.lua b/scripts/extlib.lua index 674f1b1d881..ad97ac220b8 100644 --- a/scripts/extlib.lua +++ b/scripts/extlib.lua @@ -6,6 +6,7 @@ local extlibs = { -- 3rdparty system 3rdparty -- lib name: lib name, include dir -- + asio = { "asio", "3rdparty/asio/include" }, expat = { "expat", "3rdparty/expat/lib" }, zlib = { "z", "3rdparty/zlib" }, jpeg = { "jpeg", "3rdparty/libjpeg" }, @@ -15,9 +16,16 @@ local extlibs = { portaudio = { "portaudio", "3rdparty/portaudio/include" }, lua = { "lua", "3rdparty/lua/src" }, utf8proc = { "utf8proc", "3rdparty/utf8proc" }, + glm = { "glm", "3rdparty/glm" }, + rapidjson = { "rapidjson", "3rdparty/rapidjson/include" }, } -- system lib options +newoption { + trigger = 'with-system-asio', + description = 'Use system Asio library', +} + newoption { trigger = 'with-system-expat', description = 'Use system Expat library', @@ -63,6 +71,16 @@ newoption { description = "Use system utf8proc library", } +newoption { + trigger = "with-system-glm", + description = "Use system glm library", +} + +newoption { + trigger = "with-system-rapidjson", + description = "Use system rapidjson library", +} + -- build helpers function ext_lib(lib) local opt = _OPTIONS["with-system-" .. lib] -- cgit v1.2.3-70-g09d2