AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

* Bug 3381149: Path of PCH source file in VS10 not being translated (intyuh)

Browse Source 
Re- added unit test removed in 53abc69ab87c
Applied patch from intyuh
This commit is contained in:
Liam Devine 2011-09-08 14:30:10 +01:00
parent 3e8ee40315
commit 4eeb4f76f3
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -28,6 +28,7 @@
* Bug 3308203: Incorrect relative paths for gmake sibling static libraries (Adam) * Bug 3308203: Incorrect relative paths for gmake sibling static libraries (Adam)
* Bug 3277343: SM_SERVERR2 is not always defined by default (Martin Ridgers) * Bug 3277343: SM_SERVERR2 is not always defined by default (Martin Ridgers)
* Added os.stat * Added os.stat
* Bug 3381149: Path of PCH source file in VS10 not being translated (intyuh)
------- -------
4.3 4.3

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

@ -515,9 +515,10 @@
_p(1,'<ItemGroup>') _p(1,'<ItemGroup>')
for _, file in ipairs(files) do for _, file in ipairs(files) do
_p(2,'<ClCompile Include=\"%s\">', path.translate(file.name, "\\")) local translatedpath = path.translate(file.name, "\\")
_p(2,'<ClCompile Include=\"%s\">', translatedpath)
for _, cfginfo in ipairs(configs) do for _, cfginfo in ipairs(configs) do
if config_mappings[cfginfo] and file.name == config_mappings[cfginfo] then if config_mappings[cfginfo] and translatedpath == config_mappings[cfginfo] then
_p(3,'<PrecompiledHeader '.. if_config_and_platform() .. '>Create</PrecompiledHeader>', premake.esc(cfginfo.name)) _p(3,'<PrecompiledHeader '.. if_config_and_platform() .. '>Create</PrecompiledHeader>', premake.esc(cfginfo.name))
config_mappings[cfginfo] = nil --only one source file per pch config_mappings[cfginfo] = nil --only one source file per pch
end end

8
tests/actions/vstudio/test_vs2010_vcxproj.lua
View File

@ -334,7 +334,13 @@
local buffer = get_buffer() local buffer = get_buffer()
test.string_does_not_contain(buffer,debug_config_pch_string) test.string_does_not_contain(buffer,debug_config_pch_string)
end end
function vs10_vcxproj.pchHeaderAndPchSourceSet_bufferContainPchCreate()
configuration("Debug")
pchheader "foo/dummyHeader.h"
pchsource "foo/dummySource.cpp"
local buffer = get_buffer()
test.string_contains(buffer,debug_config_pch_string)
end
function vs10_vcxproj.wholeProgramOptimizationIsNotSetByDefault_bufferDoesNotContainWholeProgramOptimization() function vs10_vcxproj.wholeProgramOptimizationIsNotSetByDefault_bufferDoesNotContainWholeProgramOptimization()
local buffer = get_buffer() local buffer = get_buffer()