Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-08 13:53:52 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Define IMGUI_DISABLE_OBSOLETE_FUNCTIONS consistently

Browse Source 
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
This commit is contained in:
Julian Sikorski 2020-08-12 18:07:26 +02:00
parent e257516259
commit 1096db17b6
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/src/3rdparty.lua
View File

@ -1395,6 +1395,7 @@ end
"__STDC_FORMAT_MACROS", "__STDC_FORMAT_MACROS",
"__STDC_CONSTANT_MACROS", "__STDC_CONSTANT_MACROS",
"BGFX_CONFIG_MAX_FRAME_BUFFERS=128", "BGFX_CONFIG_MAX_FRAME_BUFFERS=128",
"IMGUI_DISABLE_OBSOLETE_FUNCTIONS",
} }
if _OPTIONS["targetos"]=="linux" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="openbsd" then if _OPTIONS["targetos"]=="linux" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="openbsd" then