From 4725c98f5e2023d5ebbadee0dabdc76ae210da37 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sun, 11 Jun 2017 20:01:02 +0000
Subject: [PATCH] Backport some Windows build fixes from release branch

---
 mswin32/Makefile     | 4 ++--
 mswin32/nmap.vcxproj | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mswin32/Makefile b/mswin32/Makefile
index e4934d19a6..c7ef4a065a 100644
--- a/mswin32/Makefile
+++ b/mswin32/Makefile
@@ -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')
diff --git a/mswin32/nmap.vcxproj b/mswin32/nmap.vcxproj
index 402f3c2e8c..34443084df 100644
--- a/mswin32/nmap.vcxproj
+++ b/mswin32/nmap.vcxproj
@@ -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>
\ No newline at end of file
+</Project>