diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-10-26 09:05:06 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2017-10-26 17:57:28 +0000 |
| commit | b7f7bee8cf6ecb04a4dec86b80ce2065d4192da7 (patch) | |
| tree | 1c9817bb874e6b94882adf9ac6b9cd4a34927e8d /packaging/wix | |
| parent | de6fcf2f21ee0a69b1d4d418f0c6d184b161a203 (diff) | |
CMake: Set the Windows build target to Vista.
Set NTDDI_VERSION and _WIN32_WINNT to their Vista values so that
ws2tcpip.h will define inet_pton and inet_ntop. Remove the associated
compiler version checks so that everyone is on the same page.
Add breadcrumbs to the various parts of the code where we set a minimum
Windows version.
Change-Id: I83bba5fa1024bfbc02e07b120412807ad259e291
Reviewed-on: https://code.wireshark.org/review/24080
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/wix')
| -rw-r--r-- | packaging/wix/Prerequisites.wxi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/packaging/wix/Prerequisites.wxi b/packaging/wix/Prerequisites.wxi index c50b59afb8..6298113907 100644 --- a/packaging/wix/Prerequisites.wxi +++ b/packaging/wix/Prerequisites.wxi @@ -14,6 +14,11 @@ to ensure the entire fragment is included. --> <Property Id="IncludePrerequisites">1</Property> + <!-- This should match the following: + - The NTDDI_VERSION and _WIN32_WINNT parts of cmakeconfig.h.in + - The <compatibility><application> section in image\wireshark.exe.manifest.in + - The GetWindowsVersion parts of packaging\nsis\wireshark.nsi + --> <Condition Message="Windows 2000 is no longer supported. Please install $(var.WiresharkName) 1.2 or 1.0 instead."> <![CDATA[Installed OR (VersionNT < 500) OR (VersionNT > 500)]]> </Condition> |