mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2024-11-10 06:02:09 +00:00
GP-2786: A few improvements
This commit is contained in:
parent
a437164b72
commit
cddcf3d3e7
@ -52,7 +52,7 @@ model {
|
||||
}
|
||||
}
|
||||
}
|
||||
if (isCurrentWindows()) {
|
||||
if (isCurrentWindows() && VISUAL_STUDIO_INSTALL_DIR) {
|
||||
// specify installDir because Gradle doesn't find VS Build Tools.
|
||||
// See https://github.com/gradle/gradle-native/issues/617#issuecomment-575735288
|
||||
visualCpp(VisualCpp) {
|
||||
|
@ -29,13 +29,13 @@ def configureVisualStudio() {
|
||||
println "Searching for latest Visual Studio and required components..."
|
||||
def vswherePath = "C:\\Program Files (x86)\\Microsoft Visual Studio\\Installer\\vswhere.exe"
|
||||
if (!file(vswherePath).exists()) {
|
||||
println "Visual Studio not found!"
|
||||
println " -> Visual Studio vswhere.exe not found!"
|
||||
return
|
||||
}
|
||||
def vswhereOutput = "${vswherePath} -products * -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -format json".execute().text.trim()
|
||||
def vswhereJson = new groovy.json.JsonSlurper().parseText(vswhereOutput);
|
||||
if (vswhereJson.isEmpty()) {
|
||||
println "Visual Studio not found!"
|
||||
println " -> Visual Studio not found!"
|
||||
return
|
||||
}
|
||||
def vsInstallDir = vswhereJson[0].installationPath
|
||||
|
@ -327,7 +327,12 @@ system:</p>
|
||||
<li>
|
||||
<a href="https://visualstudio.microsoft.com/vs/community/">Microsoft Visual Studio</a>
|
||||
2017 or later, or <a href="https://visualstudio.microsoft.com/visual-cpp-build-tools/">
|
||||
Microsoft C++ Build Tools</a> (Windows-only)
|
||||
Microsoft C++ Build Tools</a> with the following components installed (Windows-only):
|
||||
<ul>
|
||||
<li>MSVC</li>
|
||||
<li>Windows SDK</li>
|
||||
<li>C++ ATL</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
<p>To build the native binaries for your current platform, execute the following script:</p>
|
||||
|
@ -46,7 +46,11 @@ To create the latest development build for your platform from this source reposi
|
||||
* [JDK 17 64-bit][jdk17]
|
||||
* [Gradle 7.3+][gradle]
|
||||
* make, gcc, and g++ (Linux/macOS-only)
|
||||
* [Microsoft Visual Studio][vs] or [Microsoft C++ Build Tools][vcbuildtools] (Windows-only)
|
||||
* [Microsoft Visual Studio][vs] or [Microsoft C++ Build Tools][vcbuildtools] with the following
|
||||
components installed (Windows-only):
|
||||
- MSVC
|
||||
- Windows SDK
|
||||
- C++ ATL
|
||||
|
||||
##### Download and extract the source:
|
||||
[Download from GitHub][master]
|
||||
|
Loading…
Reference in New Issue
Block a user