From ce9399fbe6fac0c0785b44f6dbec5b36bb45060d Mon Sep 17 00:00:00 2001 From: Glyn Leine Date: Fri, 15 Dec 2023 00:14:42 +0100 Subject: [PATCH] fix includes for third party libraries --- premake/rythe/projects.lua | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/premake/rythe/projects.lua b/premake/rythe/projects.lua index 96dcb6168..ede7739f3 100644 --- a/premake/rythe/projects.lua +++ b/premake/rythe/projects.lua @@ -327,21 +327,25 @@ local function getDepsRecursive(project, projectType) if fs.exists(path .. "/") then thirdPartyProject.files = {} - thirdPartyProject.additional_include_dirs = {} - thirdPartyProject.additional_external_include_dirs = {} + + thirdPartyProject.additional_include_dirs = { + path .. "/src", + path .. "/include" + } + + thirdPartyProject.additional_external_include_dirs = { + path .. "/src", + path .. "/include" + } local srcDir = path .. "/src/" .. thirdPartyProject.name .. "/" if fs.exists(srcDir) then thirdPartyProject.files[#thirdPartyProject.files + 1] = srcDir .. "**" - thirdPartyProject.additional_include_dirs[#thirdPartyProject.additional_include_dirs + 1] = srcDir - thirdPartyProject.additional_external_include_dirs[#thirdPartyProject.additional_external_include_dirs + 1] = srcDir end local includeDir = path .. "/include/" .. thirdPartyProject.name .. "/" if fs.exists(includeDir) then thirdPartyProject.files[#thirdPartyProject.files + 1] = includeDir .. "**" - thirdPartyProject.additional_include_dirs[#thirdPartyProject.additional_include_dirs + 1] = includeDir - thirdPartyProject.additional_external_include_dirs[#thirdPartyProject.additional_external_include_dirs + 1] = includeDir end if utils.tableIsEmpty(thirdPartyProject.files) then @@ -349,16 +353,6 @@ local function getDepsRecursive(project, projectType) path .. "/src/**", path .. "/include/**" } - - thirdPartyProject.additional_include_dirs = { - path .. "/src", - path .. "/include" - } - - thirdPartyProject.additional_external_include_dirs = { - path .. "/src", - path .. "/include" - } end depProject = loadProject(depId, thirdPartyProject, project.src, path, thirdPartyProject.name, "library")