summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Julian Sikorski <belegdol+github@gmail.com>2020-08-12 18:07:26 +0200
committer Julian Sikorski <belegdol+github@gmail.com>2020-08-12 18:22:59 +0200
commit1096db17b69f8afcd5dfda764d193e5bbbd8e8a5 (patch)
tree04c9eea10433e19caa4fd8441e3c80d5f40c4594
parente2575162597bed0dbd1d8ec984db8d264ef003ae (diff)
Define IMGUI_DISABLE_OBSOLETE_FUNCTIONS consistently
IMGUI_DISABLE_OBSOLETE_FUNCTIONS was defined in osd/modules.lua but not in 3rdparty.lua. As a result, two different variants of struct ImGuiIO were being defined, causing a C++ One Definition Rule violation
-rw-r--r--scripts/src/3rdparty.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index ed31a844181..b3fc924eab4 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -1395,6 +1395,7 @@ end
"__STDC_FORMAT_MACROS",
"__STDC_CONSTANT_MACROS",
"BGFX_CONFIG_MAX_FRAME_BUFFERS=128",
+ "IMGUI_DISABLE_OBSOLETE_FUNCTIONS",
}
if _OPTIONS["targetos"]=="linux" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="openbsd" then