diff options
author | Jason Perkins <starkos@industriousone.com> | 2014-01-07 20:32:59 +0400 |
---|---|---|
committer | Jason Perkins <starkos@industriousone.com> | 2014-01-07 20:32:59 +0400 |
commit | 9024ed3718aa7e8ba3c6b3830b22f38e63cd7409 (patch) | |
tree | 12634c71c7f9f7f3cf69da9936c01d1fa9fafe4e /src/actions | |
parent | 456d77ec2f3fd347b59fb192bafa7e583e23be4b (diff) | |
parent | 7ef7e1dc7d26b272c61f4dcb0e250ff80d403278 (diff) |
Merged in windirstat/premake-stable/resincludes-fix (pull request #30)
Fixing: resincludedirs broken in premake-stable (only affects ResourceCompile sections)
Diffstat (limited to 'src/actions')
-rw-r--r-- | src/actions/vstudio/vs2010_vcxproj.lua | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/actions/vstudio/vs2010_vcxproj.lua b/src/actions/vstudio/vs2010_vcxproj.lua index b6b44e7..4adef79 100644 --- a/src/actions/vstudio/vs2010_vcxproj.lua +++ b/src/actions/vstudio/vs2010_vcxproj.lua @@ -181,10 +181,18 @@ end end + local function resinclude_dirs(indent,cfg) + if #cfg.includedirs > 0 or #cfg.resincludedirs > 0 then + local dirs = table.join(cfg.includedirs, cfg.resincludedirs) + _p(indent,'<AdditionalIncludeDirectories>%s;%%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>' + ,premake.esc(path.translate(table.concat(dirs, ";"), '\\'))) + end + end + local function resource_compile(cfg) _p(2,'<ResourceCompile>') preprocessor(3,cfg) - include_dirs(3,cfg) + resinclude_dirs(3,cfg) _p(2,'</ResourceCompile>') end |