From 1096db17b69f8afcd5dfda764d193e5bbbd8e8a5 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Wed, 12 Aug 2020 18:07:26 +0200 Subject: [PATCH] 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 --- scripts/src/3rdparty.lua | 1 + 1 file changed, 1 insertion(+) 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