diff options
author | Sergeanur <s.anureev@yandex.ua> | 2021-08-25 09:07:41 +0300 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-25 09:07:41 +0300 |
commit | 800ab9296056ceeb384985cb223566c981813919 (patch) | |
tree | 53e8190b7bb84a7b960abcec3044ce7cc2d73fbf /premake5.lua | |
parent | 5f7de20cdebe36759d6fe06ff8aabc91359771f0 (diff) | |
parent | c8492ab5e00d458f50d053e6b4e7c8c7af4d32a9 (diff) |
Merge branch 'miami' into lcs
# Conflicts:
# premake5.lua
# src/audio/AudioLogic.cpp
# src/audio/AudioManager.cpp
Diffstat (limited to 'premake5.lua')
-rw-r--r-- | premake5.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/premake5.lua b/premake5.lua index 2dc2fa69..4302eae0 100644 --- a/premake5.lua +++ b/premake5.lua @@ -384,7 +384,7 @@ project "reLCS" -- iterates all configs and runs on them ["dontWrite"] = function (cfg) check_symbol_exists(cfg, "haveX11", "glfwGetX11Display", { "X11/Xlib.h", "X11/XKBlib.h", "GLFW/glfw3.h", "GLFW/glfw3native.h" }, "GLFW_EXPOSE_NATIVE_X11") - if cfg.autoconf["haveX11"] then + if cfg.autoconf["haveX11"] ~= nil and cfg.autoconf["haveX11"] == 1 then table.insert(cfg.links, "X11") table.insert(cfg.defines, "GET_KEYBOARD_INPUT_FROM_X11") end |