From ea9ac284889ce8ffd13a9e3e3b451a6e93ad1e33 Mon Sep 17 00:00:00 2001
From: liamDevine <unknown>
Date: Mon, 14 Mar 2011 14:59:59 +0000
Subject: [PATCH] pdb file was being written to the 'Link' section when it
 needed to be in 'ClCompile'. Reported by hodsondd closes bug report:
 https://sourceforge.net/tracker/?func=detail&aid=3163703&group_id=71616&atid=531878

---
 CHANGES.txt                                 | 1 +
 src/actions/vstudio/vs2010_vcxproxj.lua     | 9 ++++-----
 tests/actions/vstudio/test_vs2010_flags.lua | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 544da6f7..a7774ff7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -81,6 +81,7 @@
 - Bug 2927604: Unable to build Premake with Visual Studio
 - Clean action now removes MonoDevelop .pidb files correctly
 - Added os.executef()
+- Bug 3163703: pdb file being set in the wrong section. (hodsondd)
 
 
 -------
diff --git a/src/actions/vstudio/vs2010_vcxproxj.lua b/src/actions/vstudio/vs2010_vcxproxj.lua
index 58c7af23..cff6deba 100644
--- a/src/actions/vstudio/vs2010_vcxproxj.lua
+++ b/src/actions/vstudio/vs2010_vcxproxj.lua
@@ -377,6 +377,10 @@ local vs10_helpers = premake.vstudio.vs10_helpers
 			floating_point(cfg)
 			debug_info(cfg)
 			
+		if cfg.flags.Symbols then
+			_p(3,'<ProgramDataBaseFileName>$(OutDir)%s.pdb</ProgramDataBaseFileName>'
+				, path.getbasename(cfg.buildtarget.name))
+		end
 
 		if cfg.flags.NoFramePointer then
 			_p(3,'<OmitFramePointers>true</OmitFramePointers>')
@@ -455,11 +459,6 @@ local vs10_helpers = premake.vstudio.vs10_helpers
 			_p(3,'<OptimizeReferences>true</OptimizeReferences>')
 			_p(3,'<EnableCOMDATFolding>true</EnableCOMDATFolding>')
 		end
-		
-		if cfg.flags.Symbols then
-			_p(3,'<ProgramDataBaseFileName>$(OutDir)%s.pdb</ProgramDataBaseFileName>'
-				, path.getbasename(cfg.buildtarget.name))
-		end
 	end
 	
 	local function item_link(cfg)
diff --git a/tests/actions/vstudio/test_vs2010_flags.lua b/tests/actions/vstudio/test_vs2010_flags.lua
index 7e0a0324..97057e93 100644
--- a/tests/actions/vstudio/test_vs2010_flags.lua
+++ b/tests/actions/vstudio/test_vs2010_flags.lua
@@ -252,7 +252,7 @@ end
 function vs10_flags.symbols_bufferContainsprogramDataBaseFile()
 	flags{"Symbols"}
 	local buffer = get_buffer()
-	test.string_contains(buffer,'<Link>.*<ProgramDataBaseFileName>%$%(OutDir%)MyProject%.pdb</ProgramDataBaseFileName>.*</Link>')
+	test.string_contains(buffer,'<ClCompile>.*<ProgramDataBaseFileName>%$%(OutDir%)MyProject%.pdb</ProgramDataBaseFileName>.*</ClCompile>')
 end