Merge pull request #259 from starkos/rollback-162

Roll back pull request #162
premake · Sep 10, 2015 · fcb06ad · fcb06ad
2 parents 113112b + 5cd081c
commit fcb06ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/src/actions/vstudio/vs2010_vcxproj.lua b/src/actions/vstudio/vs2010_vcxproj.lua
@@ -1610,9 +1610,8 @@
 
 
 	function m.programDataBaseFileName(cfg)
-		if cfg.debugformat ~= "c7" and cfg.flags.Symbols then
-			p.w('<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>')
-		end -- end if
+		-- just a placeholder for overriding; will use the default VS name
+		-- for changes, see https://github.com/premake/premake-core/issues/151
 	end
 
 

diff --git a/tests/actions/vstudio/vc2010/test_compile_settings.lua b/tests/actions/vstudio/vc2010/test_compile_settings.lua
@@ -405,7 +405,6 @@
 	<PrecompiledHeader>NotUsing</PrecompiledHeader>
 	<WarningLevel>Level3</WarningLevel>
 	<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-	<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 	<Optimization>Disabled</Optimization>
 	<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
 		]]
@@ -440,7 +439,6 @@
 	<PrecompiledHeader>NotUsing</PrecompiledHeader>
 	<WarningLevel>Level3</WarningLevel>
 	<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-	<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 	<Optimization>Disabled</Optimization>
 </ClCompile>
 		]]
@@ -560,7 +558,6 @@
 	<PrecompiledHeader>NotUsing</PrecompiledHeader>
 	<WarningLevel>Level3</WarningLevel>
 	<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-	<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 		]]
 	end
 
@@ -578,7 +575,6 @@
 	<PrecompiledHeader>NotUsing</PrecompiledHeader>
 	<WarningLevel>Level3</WarningLevel>
 	<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-	<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 		]]
 	end
 
@@ -596,7 +592,6 @@
 	<PrecompiledHeader>NotUsing</PrecompiledHeader>
 	<WarningLevel>Level3</WarningLevel>
 	<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-	<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 		]]
 	end
 
@@ -614,7 +609,6 @@
 	<PrecompiledHeader>NotUsing</PrecompiledHeader>
 	<WarningLevel>Level3</WarningLevel>
 	<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-	<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 		]]
 	end
 
@@ -632,7 +626,6 @@
 	<PrecompiledHeader>NotUsing</PrecompiledHeader>
 	<WarningLevel>Level3</WarningLevel>
 	<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-	<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 		]]
 	end
 
@@ -712,7 +705,6 @@
 	<PrecompiledHeader>NotUsing</PrecompiledHeader>
 	<WarningLevel>Level3</WarningLevel>
 	<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-	<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 	<Optimization>Disabled</Optimization>
 	<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 		]]