From 7b1a1d46f84670d048a0aba1dad0c45196324f6f Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Tue, 25 May 2010 18:51:44 +0000
Subject: [PATCH] Add nmap-payloads to the Windows build.

---
 mswin32/Makefile      |  2 +-
 mswin32/nmap.vcproj   | 24 ++++++++++++++++++++++++
 mswin32/nsis/Nmap.nsi |  2 ++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/mswin32/Makefile b/mswin32/Makefile
index 029476049..f60806b69 100644
--- a/mswin32/Makefile
+++ b/mswin32/Makefile
@@ -22,7 +22,7 @@ winbuild:
 	rm -rf nmap-$(NMAP_VERSION)
 	rm -f nmap-$(NMAP_VERSION)-win32.zip
 	mkdir nmap-$(NMAP_VERSION)
-	cd Release && cp -r ../../CHANGELOG ../../COPYING nmap-mac-prefixes nmap-os-db nmap-protocols nmap-rpc nmap-service-probes nmap-services nmap.exe nmap.xsl nse_main.lua ../nmap_performance.reg ../../README-WIN32 ../nmap-$(NMAP_VERSION)/
+	cd Release && cp -r ../../CHANGELOG ../../COPYING nmap-mac-prefixes nmap-os-db nmap-payloads nmap-protocols nmap-rpc nmap-service-probes nmap-services nmap.exe nmap.xsl nse_main.lua ../nmap_performance.reg ../../README-WIN32 ../nmap-$(NMAP_VERSION)/
 	cp -f OpenSSL/bin/*.dll ./nmap-$(NMAP_VERSION)/
 	mkdir nmap-$(NMAP_VERSION)/scripts
 	cd Release && cp -f $(NSE_FILES) ../nmap-$(NMAP_VERSION)/scripts/
diff --git a/mswin32/nmap.vcproj b/mswin32/nmap.vcproj
index 737bca9c9..7abaceaf1 100644
--- a/mswin32/nmap.vcproj
+++ b/mswin32/nmap.vcproj
@@ -744,6 +744,30 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\nmap-payloads"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying $(InputName) to output directory..."
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						Outputs="$(TargetDir)$(InputName)"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying $(InputName) to output directory..."
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						Outputs="$(TargetDir)$(InputName)"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\nmap-protocols"
 				>
diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi
index 0686d7326..8cba3e740 100644
--- a/mswin32/nsis/Nmap.nsi
+++ b/mswin32/nsis/Nmap.nsi
@@ -177,6 +177,7 @@ Section "Nmap Core Files" SecCore
   File ..\..\COPYING 
   File ..\..\nmap-mac-prefixes 
   File ..\..\nmap-os-db 
+  File ..\..\nmap-payloads 
   File ..\..\nmap-protocols 
   File ..\..\nmap-rpc 
   File ..\..\nmap-service-probes 
@@ -392,6 +393,7 @@ Section "Uninstall"
   Delete "$INSTDIR\COPYING" 
   Delete "$INSTDIR\nmap-mac-prefixes" 
   Delete "$INSTDIR\nmap-os-db" 
+  Delete "$INSTDIR\nmap-payloads" 
   Delete "$INSTDIR\nmap-protocols" 
   Delete "$INSTDIR\nmap-rpc" 
   Delete "$INSTDIR\nmap-service-probes"