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 | 0c3aabfe9220f945a4d5d356bd102f185406237d (patch) | |
| tree | 12634c71c7f9f7f3cf69da9936c01d1fa9fafe4e | |
| parent | db6809fd755632f886619496187e4ec8e0ccfa65 (diff) | |
| parent | e099a3d740ca409c4fe8a07c677d7c9ec1f835ce (diff) | |
Merged in windirstat/premake-stable/resincludes-fix (pull request #30)
Fixing: resincludedirs broken in premake-stable (only affects ResourceCompile sections)
| -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 |