summaryrefslogtreecommitdiffstats
path: root/scripts/extlib.lua
diff options
context:
space:
mode:
author Julian Sikorski <belegdol+github@gmail.com>2018-02-08 22:06:25 +0100
committer R. Belmont <rb6502@users.noreply.github.com>2018-02-08 16:06:25 -0500
commit8cc758355d51920adb7dc5b5899cf5fdca9fbd74 (patch)
treec806616593f525c9deba1a8cfd7b9bb1e708c035 /scripts/extlib.lua
parent556bdf249f76f415cc7fc8f2d72762688ef97440 (diff)
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
Diffstat (limited to 'scripts/extlib.lua')
-rw-r--r--scripts/extlib.lua18
1 files changed, 18 insertions, 0 deletions
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,10 +16,17 @@ 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]