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 @@ -162,6 +162,11 @@ newoption { description = 'Build bundled SDL2 library', } +newoption { + trigger = 'with-bundled-libuv', + description = 'Build bundled libuv library', +} + newoption { trigger = "distro", description = "Choose distribution", 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 --------------------------------------------------