From c8db02ae8207dd1e72023dfa5b1e7172a077e3f6 Mon Sep 17 00:00:00 2001 From: otavepto <153766569+otavepto@users.noreply.github.com> Date: Tue, 28 May 2024 01:44:46 +0300 Subject: [PATCH] properly fix compilation of ingame_overlay for linux --- premake5-deps.lua | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/premake5-deps.lua b/premake5-deps.lua index 09460d9d..2d8263d3 100644 --- a/premake5-deps.lua +++ b/premake5-deps.lua @@ -611,26 +611,27 @@ if _OPTIONS["build-ingame_overlay"] or _OPTIONS["all-build"] then local ingame_overlay_missing_inc = {} if string.match(_ACTION, 'gmake.*') then ingame_overlay_missing_inc = { - 'CMAKE_CXX_FLAGS_RELEASE="-include cstdint -include cinttypes"' + '-include cstdint', + '-include cinttypes', } end if _OPTIONS["32-build"] then - cmake_build('ingame_overlay/deps/System', true, merge_list(ingame_overlay_missing_inc, { + cmake_build('ingame_overlay/deps/System', true, { 'BUILD_SYSTEMLIB_TESTS=OFF', - })) + }, nil, ingame_overlay_missing_inc) cmake_build('ingame_overlay/deps/mini_detour', true, { 'BUILD_MINIDETOUR_TESTS=OFF', }) - cmake_build('ingame_overlay', true, merge_list(ingame_overlay_missing_inc, ingame_overlay_common_defs)) + cmake_build('ingame_overlay', true, ingame_overlay_common_defs, nil, ingame_overlay_missing_inc) end if _OPTIONS["64-build"] then - cmake_build('ingame_overlay/deps/System', false, merge_list(ingame_overlay_missing_inc, { + cmake_build('ingame_overlay/deps/System', false, { 'BUILD_SYSTEMLIB_TESTS=OFF', - })) + }, nil, ingame_overlay_missing_inc) cmake_build('ingame_overlay/deps/mini_detour', false, { 'BUILD_MINIDETOUR_TESTS=OFF', }) - cmake_build('ingame_overlay', false, merge_list(ingame_overlay_missing_inc, ingame_overlay_common_defs)) + cmake_build('ingame_overlay', false, ingame_overlay_common_defs, nil, ingame_overlay_missing_inc) end end