diff --git a/Makefile.nmake b/Makefile.nmake index 77be3386c9..6aec541513 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -7,6 +7,24 @@ include config.nmake include +##### Deprecation ##### +# Support for NMake and QMake will be removed in June 2016. Removal includes +# the following files: +# +# Makefile.nmake in the top level and most subdirectories. +# Makefile.nmake.inc +# config.nmake +# epan/dissectors/asn1/Makefile.inc.nmake +# epan/dissectors/asn1/Makefile.preinc.nmake +# packaging/nsis/Custom.nmake +# plugins/*/moduleinfo.nmake +# tools/native-nmake.cmd +# tools/win-setup.sh +# +# Additionally, the following files reference the nmake environment: +# make-version.pl +# The autotools 'dist' target + ############### no need to modify below this line ######### CC = cl diff --git a/config.nmake b/config.nmake index 7214485ea0..b363b507f7 100644 --- a/config.nmake +++ b/config.nmake @@ -1,6 +1,19 @@ # Some more information about the settings in this file can be found in # the file README.windows and the Developer's Guide (available online). +##### Deprecation ##### +# Support for NMake and QMake will be removed in June 2016. +# Uncomment the following line or pass YES_I_KNOW_ABOUT_THE_DEPRECATION=1 +# on the command line to override. + +#YES_I_KNOW_ABOUT_THE_DEPRECATION=1 +!IFNDEF YES_I_KNOW_ABOUT_THE_DEPRECATION +!MESSAGE Nmake is being deprecated. Please consider using CMake instead. +!MESSAGE See https://www.wireshark.org/docs/wsdg_html_chunked/ChSetupWin32.html +!MESSAGE for details. +!ERROR Set YES_I_KNOW_ABOUT_THE_DEPRECATION to disable this message. +!ENDIF + ##### Program name ##### # Changing the name is experimental and may break the installer/uninstaller and possibly other stuff. # Application data will still be under the same dir as Wireshark so preference files, profiles, and etc