PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00
Code Issues Projects Releases Wiki Activity

Backport some Windows build fixes from release branch

Browse Source
This commit is contained in:
dmiller
2017-06-11 20:01:02 +00:00
parent b4e1daef74
commit 4725c98f5e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mswin32/Makefile
View File

@@ -1,7 +1,7 @@
MAKENSIS="/cygdrive/c/Program Files/NSIS/makensis.exe"
# VCExpress.exe is devenv.com with the commercial Visual Studio suite instead of VC++ Express
VCEXPRESS := $(shell reg query "HKEY_CLASSES_ROOT\\Applications\\devenv.exe\\shell\\edit\\command" | egrep -i '[A-Z]:\\' | cut -d\" -f2 | sed 's%\\%/%g' | tr -d '\n')
SIGNTOOL := $(shell reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v8.1" /v "InstallationFolder" | egrep InstallationFolder | cut -d ' ' -f13- | sed 's%\\%/%g' | tr -d '\n' | sed 's%$$%bin/x86/signtool.exe%')
VCEXPRESS := $(shell reg query "HKEY_CLASSES_ROOT\\Applications\\devenv.exe\\shell\\edit\\command" | egrep -i '[A-Z]:\\' | cut -d\" -f2 | sed 's%\\%/%g' | tr -d '\r\n')
SIGNTOOL := $(shell reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v8.1" /v "InstallationFolder" | egrep InstallationFolder | cut -d ' ' -f13- | sed 's%\\%/%g' | tr -d '\r\n' | sed 's%$$%bin/x86/signtool.exe%')
export NMAP_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_VERSION' ../nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q')
export NMAP_NUM_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_NUM_VERSION' ../nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q')
export NPCAP_VERSION := $(shell ls npcap-*.exe | sed -e 's/npcap-\([-r0-9.]*\)\.exe/\1/' -e 'q')

4
mswin32/nmap.vcxproj
View File

@@ -168,6 +168,7 @@
<ClCompile Include="..\scan_engine.cc" />
<ClCompile Include="..\scan_engine_connect.cc" />
<ClCompile Include="..\scan_engine_raw.cc" />
<ClCompile Include="..\scan_lists.cc" />
<ClCompile Include="..\service_scan.cc" />
<ClCompile Include="..\services.cc" />
<ClCompile Include="..\Target.cc" />
@@ -221,6 +222,7 @@
<ClInclude Include="..\scan_engine.h" />
<ClInclude Include="..\scan_engine_connect.h" />
<ClInclude Include="..\scan_engine_raw.h" />
<ClInclude Include="..\scan_lists.h" />
<ClInclude Include="..\service_scan.h" />
<ClInclude Include="..\services.h" />
<ClInclude Include="..\targets.h" />
@@ -340,4 +342,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>