Merge remote-tracking branch 'origin/GT-3275_ryanmkurtz_PR-1032_kant2…

…002_msbuild-pdb'
aladur · Nov 1, 2019 · 84fb430 · 84fb430
2 parents bf1bef0 + d1d68af
commit 84fb430
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Ghidra/Features/PDB/build.gradle b/Ghidra/Features/PDB/build.gradle
@@ -49,13 +49,14 @@ if ("win64".equals(getCurrentPlatformName())) {
 
 		def projectPathWindows = projectPath.replace("/", File.separator)
 		def solutionPathWindows = "${projectPathWindows}\\src\\pdb\\pdb.sln"
-		def outputPathWindows = "${projectPathWindows}\\build\\os\\win64\\pdb.exe"
+		def platformToolset = 'v' + MSVC_TOOLS_VERSION.substring(0, 4).replace('.', '');
+		def windowsTargetPlatformVersion = findProperty("WindowsTargetPlatformVersion") ?: ""
 
 		doFirst {
 			file("build/os/win64").mkdirs()
 			new File(solutionBatchFilePath).withWriter { out ->
 				out.println "call " + VISUAL_STUDIO_VCVARS_CMD
-				out.println "devenv ${solutionPathWindows} /build Release /project pdb"
+				out.println "msbuild ${solutionPathWindows} /p:Configuration=Release /p:PlatformToolset=${platformToolset} /p:WindowsTargetPlatformVersion=${windowsTargetPlatformVersion}"
 			}
 		}
 

diff --git a/Ghidra/Features/PDB/src/pdb/pdb.vcxproj b/Ghidra/Features/PDB/src/pdb/pdb.vcxproj
@@ -13,7 +13,6 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{343E9778-3C04-476E-8F90-A114AA7AA108}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">