diff --git a/modules/codelite/codelite_project.lua b/modules/codelite/codelite_project.lua
index 1eb2ae1f23..7c5a2283c4 100755
--- a/modules/codelite/codelite_project.lua
+++ b/modules/codelite/codelite_project.lua
@@ -196,9 +196,10 @@
end
local toolset = m.getcompiler(cfg)
+ local sysincludedirs = toolset.getincludedirs(cfg, {}, cfg.sysincludedirs)
local forceincludes = toolset.getforceincludes(cfg)
- local cxxflags = table.concat(table.join(toolset.getcxxflags(cfg), forceincludes, cfg.buildoptions), ";")
- local cflags = table.concat(table.join(toolset.getcflags(cfg), forceincludes, cfg.buildoptions), ";")
+ local cxxflags = table.concat(table.join(sysincludedirs, toolset.getcxxflags(cfg), forceincludes, cfg.buildoptions), ";")
+ local cflags = table.concat(table.join(sysincludedirs, toolset.getcflags(cfg), forceincludes, cfg.buildoptions), ";")
local asmflags = ""
local pch = ""
@@ -241,7 +242,7 @@
local options = table.concat(cfg.resoptions, ";")
_x(3, '', defines, options)
- for _, includepath in ipairs(table.join(cfg.includedirs, cfg.resincludedirs)) do
+ for _, includepath in ipairs(table.join(cfg.sysincludedirs, cfg.includedirs, cfg.resincludedirs)) do
_x(4, '', project.getrelative(cfg.project, includepath))
end
_p(3, '')
diff --git a/modules/codelite/tests/test_codelite_config.lua b/modules/codelite/tests/test_codelite_config.lua
index 7d1c37e58b..bece03d453 100644
--- a/modules/codelite/tests/test_codelite_config.lua
+++ b/modules/codelite/tests/test_codelite_config.lua
@@ -68,6 +68,17 @@
]]
end
+ function suite.OnProjectCfg_SysIncludes()
+ sysincludedirs { "sysdir", "sysdir2/"}
+ prepare()
+ codelite.project.compiler(cfg)
+ test.capture [[
+
+
+ ]]
+ end
+
+
function suite.OnProjectCfg_Defines()
defines { "TEST", "DEF", "VAL=1", "ESCAPE=\"WITH SPACE\"" }
prepare()
@@ -136,6 +147,30 @@
]]
end
+ function suite.OnProjectCfg_ResRegularInclude()
+ files { "x.rc" }
+ includedirs { "regulardir/" }
+ prepare()
+ codelite.project.resourceCompiler(cfg)
+ test.capture [[
+
+
+
+ ]]
+ end
+
+ function suite.OnProjectCfg_ResSysInclude()
+ files { "x.rc" }
+ sysincludedirs { "sysdir/" }
+ prepare()
+ codelite.project.resourceCompiler(cfg)
+ test.capture [[
+
+
+
+ ]]
+ end
+
function suite.OnProjectCfg_General()
system "Windows"
prepare()