AuroraPipeline/fuck-premake-old2
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merged in mologie/premake-dev/vs2010-rc-quotes-fix (pull request #38)

Browse Source 
Fix syntax for resource preprocessor definitions including quotes in VS2010
This commit is contained in:
Jason Perkins 2013-04-23 11:04:57 -04:00
commit 8c1833aa2a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/actions/vstudio/vs2010_vcxproj.lua
View File

@ -292,7 +292,7 @@
function vc2010.resourceCompile(cfg)
if cfg.kind ~= premake.MAKEFILE and cfg.system ~= premake.XBOX360 then
_p(2,'<ResourceCompile>')
vc2010.preprocessorDefinitions(cfg, table.join(cfg.defines, cfg.resdefines))
vc2010.preprocessorDefinitions(cfg, table.join(cfg.defines, cfg.resdefines), true)
vc2010.additionalIncludeDirectories(cfg, table.join(cfg.includedirs, cfg.resincludedirs))
_p(2,'</ResourceCompile>')
end
@ -930,9 +930,12 @@
end
function vc2010.preprocessorDefinitions(cfg, defines)
function vc2010.preprocessorDefinitions(cfg, defines, escapeQuotes)
if #defines > 0 then
defines = table.concat(defines, ";")
if escapeQuotes then
defines = defines:gsub('"', '\\"')
end
_x(3,'<PreprocessorDefinitions>%s;%%(PreprocessorDefinitions)</PreprocessorDefinitions>', defines)
end
end