summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Julian Sikorski <belegdol+github@gmail.com>2016-03-12 13:07:14 +0100
committer Julian Sikorski <belegdol+github@gmail.com>2016-03-12 13:07:14 +0100
commitd0f99d22a7f11efe1abaa8a0bd63eccb5e36735b (patch)
treefce9ec04b92dcba65543663b77dfaa86879ca924
parentdcab55bf53b94713a6f72e9633f5101c8dd6c08c (diff)
Added ability to build using system libuv (1.8.0 or higher required)
-rw-r--r--makefile5
-rw-r--r--scripts/genie.lua5
-rw-r--r--scripts/src/3rdparty.lua6
3 files changed, 16 insertions, 0 deletions
diff --git a/makefile b/makefile
index 42bfb7e236d..b065c4480c8 100644
--- a/makefile
+++ b/makefile
@@ -61,6 +61,7 @@
# USE_SYSTEM_LIB_SQLITE3 = 1
# USE_SYSTEM_LIB_PORTMIDI = 1
# USE_SYSTEM_LIB_PORTAUDIO = 1
+# USE_SYSTEM_LIB_UV = 1
# USE_BUNDLED_LIB_SDL2 = 1
# MESA_INSTALL_ROOT = /opt/mesa
@@ -403,6 +404,10 @@ ifdef USE_BUNDLED_LIB_SDL2
PARAMS += --with-bundled-sdl2
endif
+ifndef USE_SYSTEM_LIB_UV
+PARAMS += --with-bundled-libuv
+endif
+
#-------------------------------------------------
# distribution may change things
#-------------------------------------------------
diff --git a/scripts/genie.lua b/scripts/genie.lua
index ad60bc79252..c35252e2657 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -163,6 +163,11 @@ newoption {
}
newoption {
+ trigger = 'with-bundled-libuv',
+ description = 'Build bundled libuv library',
+}
+
+newoption {
trigger = "distro",
description = "Choose distribution",
allowed = {
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 62262cef282..525789a92f1 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -951,6 +951,7 @@ end
-- libuv library objects
--------------------------------------------------
if _OPTIONS["USE_LIBUV"]=="1" then
+if _OPTIONS["with-bundled-libuv"] then
project "uv"
uuid "cd2afe7f-139d-49c3-9000-fc9119f3cea0"
kind "StaticLib"
@@ -1160,6 +1161,11 @@ project "http-parser"
}
end
+else
+links {
+ "libuv",
+}
+end
--------------------------------------------------
-- SDL2 library
--------------------------------------------------