From 6ce7c2e34d68106f1389d02f2bc960926d42aaad Mon Sep 17 00:00:00 2001 From: david Date: Thu, 4 Nov 2010 18:16:40 +0000 Subject: [PATCH] Upgrade the Windows build files using the Visual C++ 2010 Express conversion wizard. At this point the solution doesn't build. --- libdnet-stripped/libdnet-stripped.vcproj | 287 ------- libdnet-stripped/libdnet-stripped.vcxproj | 116 +++ liblua/liblua.vcproj | 400 ---------- liblua/liblua.vcxproj | 156 ++++ libnetutil/libnetutil.vcproj | 178 ----- libnetutil/libnetutil.vcxproj | 85 ++ libpcre/libpcre.vcproj | 276 ------- libpcre/libpcre.vcxproj | 110 +++ mswin32/nmap.sln | 42 +- mswin32/nmap.vcproj | 911 ---------------------- mswin32/nmap.vcxproj | 365 +++++++++ 11 files changed, 843 insertions(+), 2083 deletions(-) delete mode 100755 libdnet-stripped/libdnet-stripped.vcproj create mode 100755 libdnet-stripped/libdnet-stripped.vcxproj delete mode 100644 liblua/liblua.vcproj create mode 100644 liblua/liblua.vcxproj delete mode 100644 libnetutil/libnetutil.vcproj create mode 100644 libnetutil/libnetutil.vcxproj delete mode 100644 libpcre/libpcre.vcproj create mode 100644 libpcre/libpcre.vcxproj delete mode 100644 mswin32/nmap.vcproj create mode 100644 mswin32/nmap.vcxproj diff --git a/libdnet-stripped/libdnet-stripped.vcproj b/libdnet-stripped/libdnet-stripped.vcproj deleted file mode 100755 index 52df1f2cb..000000000 --- a/libdnet-stripped/libdnet-stripped.vcproj +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libdnet-stripped/libdnet-stripped.vcxproj b/libdnet-stripped/libdnet-stripped.vcxproj new file mode 100755 index 000000000..8e14fcaaf --- /dev/null +++ b/libdnet-stripped/libdnet-stripped.vcxproj @@ -0,0 +1,116 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + dnet + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C} + dnet + Win32Proj + + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + .\ + $(Configuration)\ + .\ + Release\ + + + + /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) + Disabled + include;..\mswin32\pcap-include;%(AdditionalIncludeDirectories) + WIN32;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + $(OutDir)libdnet-stripped.lib + + + + + /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) + include;..\mswin32\pcap-include;%(AdditionalIncludeDirectories) + WIN32;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + $(OutDir)libdnet-stripped.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/liblua/liblua.vcproj b/liblua/liblua.vcproj deleted file mode 100644 index 001ddf250..000000000 --- a/liblua/liblua.vcproj +++ /dev/null @@ -1,400 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liblua/liblua.vcxproj b/liblua/liblua.vcxproj new file mode 100644 index 000000000..62dd35ce8 --- /dev/null +++ b/liblua/liblua.vcxproj @@ -0,0 +1,156 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {31FB0767-A71F-4575-8379-002D72B8AF86} + liblua + Win32Proj + + + + StaticLibrary + NotSet + true + + + StaticLibrary + NotSet + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + .\ + $(Configuration)\ + .\ + $(Configuration)\ + + + + /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) + Disabled + WIN32;_LIB;%(PreprocessorDefinitions) + true + + + Default + MultiThreadedDebug + false + false + false + + + Level3 + EditAndContinue + Cdecl + CompileAsC + + + "$(OutDir)liblua.lib" + + + + + /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) + false + WIN32;_LIB;%(PreprocessorDefinitions) + false + + + Default + MultiThreadedDLL + false + false + false + + + Level3 + + + CompileAsC + + + "$(OutDir)liblua.lib" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libnetutil/libnetutil.vcproj b/libnetutil/libnetutil.vcproj deleted file mode 100644 index a12351f7a..000000000 --- a/libnetutil/libnetutil.vcproj +++ /dev/null @@ -1,178 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libnetutil/libnetutil.vcxproj b/libnetutil/libnetutil.vcxproj new file mode 100644 index 000000000..c5bab213f --- /dev/null +++ b/libnetutil/libnetutil.vcxproj @@ -0,0 +1,85 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {99157C3F-39F6-4663-99D7-1D9C1484494E} + libnetutil + Win32Proj + + + + StaticLibrary + Unicode + true + + + StaticLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + .\ + $(Configuration)\ + .\ + $(Configuration)\ + + + + Disabled + ..;../mswin32;../nbase;../mswin32/pcap-include;../libdnet-stripped/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + $(OutDir)libnetutil.lib + + + + + MaxSpeed + true + ..;../mswin32;../nbase;../mswin32/pcap-include;../libdnet-stripped/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + + + + + + + + + + \ No newline at end of file diff --git a/libpcre/libpcre.vcproj b/libpcre/libpcre.vcproj deleted file mode 100644 index 225032387..000000000 --- a/libpcre/libpcre.vcproj +++ /dev/null @@ -1,276 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libpcre/libpcre.vcxproj b/libpcre/libpcre.vcxproj new file mode 100644 index 000000000..f7b51ebaa --- /dev/null +++ b/libpcre/libpcre.vcxproj @@ -0,0 +1,110 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {5DE86C7A-DE72-4265-8807-4CA38F94F22A} + Win32Proj + + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + .\ + Debug\ + .\ + Release\ + + + + Disabled + WIN32;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + CompileAsC + + + $(OutDir)libpcre.lib + + + + + WIN32;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + $(OutDir)libpcre.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mswin32/nmap.sln b/mswin32/nmap.sln index c56d26f41..def15cd8d 100644 --- a/mswin32/nmap.sln +++ b/mswin32/nmap.sln @@ -1,42 +1,22 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nmap", "nmap.vcproj", "{361719F0-AB42-4C93-9DE8-7D2144B96625}" - ProjectSection(ProjectDependencies) = postProject - {31FB0767-A71F-4575-8379-002D72B8AF86} = {31FB0767-A71F-4575-8379-002D72B8AF86} - {5DE86C7A-DE72-4265-8807-4CA38F94F22A} = {5DE86C7A-DE72-4265-8807-4CA38F94F22A} - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C} = {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C} - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4} = {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4} - {B630C8F7-3138-43E8-89ED-78742FA2AC5F} = {B630C8F7-3138-43E8-89ED-78742FA2AC5F} - EndProjectSection +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C++ Express 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nmap", "nmap.vcxproj", "{361719F0-AB42-4C93-9DE8-7D2144B96625}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nsock", "..\nsock\nsock.vcproj", "{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}" - ProjectSection(ProjectDependencies) = postProject - {B630C8F7-3138-43E8-89ED-78742FA2AC5F} = {B630C8F7-3138-43E8-89ED-78742FA2AC5F} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nsock", "..\nsock\nsock.vcxproj", "{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre", "..\libpcre\libpcre.vcproj", "{5DE86C7A-DE72-4265-8807-4CA38F94F22A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre", "..\libpcre\libpcre.vcxproj", "{5DE86C7A-DE72-4265-8807-4CA38F94F22A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nbase", "..\nbase\nbase.vcproj", "{B630C8F7-3138-43E8-89ED-78742FA2AC5F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nbase", "..\nbase\nbase.vcxproj", "{B630C8F7-3138-43E8-89ED-78742FA2AC5F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnet", "..\libdnet-stripped\libdnet-stripped.vcproj", "{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnet", "..\libdnet-stripped\libdnet-stripped.vcxproj", "{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\liblua\liblua.vcproj", "{31FB0767-A71F-4575-8379-002D72B8AF86}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\liblua\liblua.vcxproj", "{31FB0767-A71F-4575-8379-002D72B8AF86}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ncat", "..\ncat\ncat.vcproj", "{C1E04411-E021-468B-83F1-CB624BBA7589}" - ProjectSection(ProjectDependencies) = postProject - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4} = {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4} - {B630C8F7-3138-43E8-89ED-78742FA2AC5F} = {B630C8F7-3138-43E8-89ED-78742FA2AC5F} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ncat", "..\ncat\ncat.vcxproj", "{C1E04411-E021-468B-83F1-CB624BBA7589}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nping", "..\nping\nping.vcproj", "{CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}" - ProjectSection(ProjectDependencies) = postProject - {99157C3F-39F6-4663-99D7-1D9C1484494E} = {99157C3F-39F6-4663-99D7-1D9C1484494E} - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C} = {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C} - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4} = {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4} - {B630C8F7-3138-43E8-89ED-78742FA2AC5F} = {B630C8F7-3138-43E8-89ED-78742FA2AC5F} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nping", "..\nping\nping.vcxproj", "{CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnetutil", "..\libnetutil\libnetutil.vcproj", "{99157C3F-39F6-4663-99D7-1D9C1484494E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnetutil", "..\libnetutil\libnetutil.vcxproj", "{99157C3F-39F6-4663-99D7-1D9C1484494E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/mswin32/nmap.vcproj b/mswin32/nmap.vcproj deleted file mode 100644 index 781391176..000000000 --- a/mswin32/nmap.vcproj +++ /dev/null @@ -1,911 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mswin32/nmap.vcxproj b/mswin32/nmap.vcxproj new file mode 100644 index 000000000..b686f6693 --- /dev/null +++ b/mswin32/nmap.vcxproj @@ -0,0 +1,365 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {361719F0-AB42-4C93-9DE8-7D2144B96625} + nmap + + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + .\$(Configuration)\ + .\$(Configuration)\ + true + .\Release\ + .\Release\ + true + + + + .\Debug/nmap.tlb + + + + + Disabled + ..\liblua;.;..;../nbase;../libpcre;winip;..\nsock\include;pcap-include;..\libdnet-stripped\include;OpenSSL\include;%(AdditionalIncludeDirectories) + WIN32;_CONSOLE;%(PreprocessorDefinitions) + false + false + false + EnableFastChecks + MultiThreadedDebug + + + .\Debug/nmap.pch + .\Debug/ + .\Debug/ + .\Debug/ + Level2 + true + EditAndContinue + CompileAsCpp + + + liblua.lib;nsock.lib;libpcre.lib;nbase.lib;libdnet-stripped.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libeay32.lib;ssleay32.lib;shell32.lib;libnetutil.lib + .\Debug\nmap.exe + true + lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;OpenSSL\lib;%(AdditionalLibraryDirectories) + %(IgnoreSpecificDefaultLibraries) + packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs) + true + .\Debug/nmap.pdb + Console + false + + + MachineX86 + + + xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy "$(SolutionDir)\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y + + + + + .\Release/nmap.tlb + + + + + MaxSpeed + OnlyExplicitInline + .;..;../liblua;../nbase;../libpcre;winip;..\nsock\include;pcap-include;..\libdnet-stripped\include;OpenSSL\include;%(AdditionalIncludeDirectories) + WIN32;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + + .\Release/nmap.pch + .\Release/ + .\Release/ + .\Release/ + true + CompileAsCpp + + + liblua.lib;nsock.lib;libpcre.lib;nbase.lib;libdnet-stripped.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libeay32.lib;ssleay32.lib;shell32.lib;libnetutil.lib + .\Release/nmap.exe + true + lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;OpenSSL\lib;%(AdditionalLibraryDirectories) + %(IgnoreSpecificDefaultLibraries) + packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs) + .\Release/nmap.pdb + Console + true + true + MachineX86 + + + xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sync + Sync + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) + Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) + + + Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) + Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) + + + Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) + Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) + + + Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) + Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) + + + Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) + Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) + + + Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) + Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) + + + Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) + Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) + + + Copying %(Filename).xsl to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename).xsl" > nul + + $(TargetDir)%(Filename).xsl;%(Outputs) + Copying %(Filename).xsl to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename).xsl" > nul + + $(TargetDir)%(Filename).xsl;%(Outputs) + + + + + {5328e0be-bc0a-4c2a-8cb9-ce00b61b9c4c} + false + + + {31fb0767-a71f-4575-8379-002d72b8af86} + false + + + {5de86c7a-de72-4265-8807-4ca38f94f22a} + false + + + {b630c8f7-3138-43e8-89ed-78742fa2ac5f} + false + + + {f8d6d1e3-d4ea-402c-98aa-168e5309baf4} + false + + + + + + \ No newline at end of file