[RTPproxy] Remove non-existent reply

[metze/wireshark/wip.git] / config.nmake

diff --git a/config.nmake b/config.nmake
index 942499ef28d2466fbd58293fc980e96619ff82e9..5831ef3350de3ee1e07cc851837ae4c3276d7829 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -14,9 +14,9 @@ PROGRAM_NAME=Wireshark
 ##### Target platform #####
 
 # Pick up the value from the environment, VS2012 onwards sets PLATFORM via
-#  vcvarsall.bat (it appears for X64 only).
+# vcvarsall.bat (it appears for X64 only).
 # For VS2010 and earlier you'll have to set the value yourself
-!IF "$(PLATFORM)" == "X64"
+!IF "$(PLATFORM)" == "x64" || "$(PLATFORM)" == "X64"
 WIRESHARK_TARGET_PLATFORM=win64
 !ENDIF
 
@@ -35,7 +35,7 @@ VCS_REVISION=0
 # Updated by make-version.pl
 VERSION_MAJOR=1
 VERSION_MINOR=99
-VERSION_MICRO=2
+VERSION_MICRO=6
 VERSION_BUILD=$(VCS_REVISION)
 
 # Local build information. Recommended: Unique string for your
@@ -44,6 +44,13 @@ VERSION_BUILD=$(VCS_REVISION)
 
 VERSION_EXTRA=$(WIRESHARK_VERSION_EXTRA)
 
+# Banner shown at top right of Qt welcome screen.
+!IFDEF WIRESHARK_VERSION_FLAVOR
+VERSION_FLAVOR=$(WIRESHARK_VERSION_FLAVOR)
+!ELSE
+VERSION_FLAVOR=Development Build
+!ENDIF
+
 # The version of the wiretap library. Recommended: Leave unchanged.
 WTAP_VERSION_MAJOR=$(VERSION_MAJOR)
 WTAP_VERSION_MINOR=$(VERSION_MINOR)
@@ -72,8 +79,7 @@ PROGRAM_FILES=$(PROGRAMFILES)
 PROGRAM_FILES_W6432=$(PROGRAMW6432)
 
 #
-# Location of the "tools" directory. This affects HTML2TXT below and should
-# be overridden by makefiles in any subdirectories that use HTML2TXT.
+# Location of the "tools" directory. This affects the path to textify.ps1
 !IFNDEF TOOLS_DIR
 TOOLS_DIR=tools
 !ENDIF
@@ -141,7 +147,7 @@ MSVC_VARIANT=MSVC2013
 ##         when vcvarsall.bat is called to set up the build environment.
 ##        [*]One possibility: download the Windows 7 Platform SDK and copy
 ##         win32.mak from ...\Microsoft SDKs\Windows\v7.[something]\include
-##         See: http://ask.wireshark.org/questions/14343/setting-development-project-under-visual-studio-2012
+##         See: https://ask.wireshark.org/questions/14343/setting-development-project-under-visual-studio-2012
 ##    2. Dec 28,2012: "VS2012 Update 1" is required to use VS 2012 to build an .exe which
 ##        will run on Windows XP (as well as on later versions of Windows).
 ##        ToDo: It appears that some special setup is required to to do this.
@@ -168,7 +174,7 @@ MSVC_VARIANT=MSVC2013
 ##         when vcvarsall.bat is called to set up the build environment.
 ##        [*]One possibility: download the Windows 7 Platform SDK and copy
 ##         win32.mak from ...\Microsoft SDKs\Windows\v7.[something]\include
-##         See: http://ask.wireshark.org/questions/14343/setting-development-project-under-visual-studio-2012
+##         See: https://ask.wireshark.org/questions/14343/setting-development-project-under-visual-studio-2012
 #MSVC_VARIANT=MSVC2013EE
 
 # The default if we haven't set a system environment variable or
@@ -209,7 +215,10 @@ NASM=$(WIRESHARK_LIB_DIR)\nasm-2.09.08\nasm.exe
 
 # Find native Python automatically if PYTHON(_DIR) wasn't defined
 !IF !DEFINED(PYTHON) && !DEFINED(PYTHON_DIR)
-!IF EXIST(c:\Python27\python.exe)
+!IF EXIST(c:\tools\python2\python.exe)
+# Chocolatey default
+PYTHON_DIR=C:\tools\python2
+!ELSE IF EXIST(c:\Python27\python.exe)
 PYTHON_VER=27
 !ELSE IF EXIST(c:\Python26\python.exe)
 PYTHON_VER=26
@@ -242,7 +251,7 @@ PCAP_NG_DEFAULT=^#define PCAP_NG_DEFAULT 1
 WANT_PACKET_EDITOR=^#define WANT_PACKET_EDITOR 1
 
 !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
-DOWNLOAD_TAG=2014-10-01
+DOWNLOAD_TAG=2015-04-06
 ##### Win32 Libraries #####
 #
 # Mandatory: GLib settings
@@ -375,8 +384,7 @@ PCAP_REMOTE=1
 #
 # If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't
 # defined.
-# EXperimental only use zlib 1.2.5 on win32 for now
-ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib125
+ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib-1.2.8
 
 #
 # Optional: the ADNS library enables asynchronous (nonblocking) DNS
@@ -504,7 +512,7 @@ GEOIP_PKG=1.5.1-2
 WINSPARKLE_PKG=0.3-44-g2c8d9d3-win32ws
 
 !else
-DOWNLOAD_TAG=2014-10-13
+DOWNLOAD_TAG=2015-04-06
 ##### Win64 Libraries #####
 #
 # Mandatory: GLib settings
@@ -628,7 +636,7 @@ PCAP_REMOTE=1
 # If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't
 # defined.
 #
-ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib125
+ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib-1.2.8
 
 #
 # Optional: the ADNS library enables asynchronous (nonblocking) DNS
@@ -778,10 +786,15 @@ GTK_SCHEMAS_DIR=\share\glib-2.0\schemas
 # Set up the path to the Cygwin binaries
 # First check whether a 32-bit Cygwin installation exists
 # If not, check for a 64-bit Cygwin installation
-!IF EXIST(C:\cygwin\bin)
+!IF EXIST($(CYGWIN_PATH))
+# Do nothing
+!ELSE IF EXIST(C:\cygwin\bin)
 CYGWIN_PATH=C:\cygwin\bin
 !ELSE IF EXIST(C:\cygwin64\bin)
 CYGWIN_PATH=C:\cygwin64\bin
+!ELSE IF EXIST(C:\tools\cygwin\bin)
+# Chocolatey default
+CYGWIN_PATH=C:\tools\cygwin\bin
 !ELSE
 !ERROR Could not locate Cygwin, please set CYGWIN_PATH explicitly in config.nmake
 !ENDIF
@@ -1176,7 +1189,7 @@ VCREDIST_EXE=$(VCREDIST_DIR)\vcredist_$(TARGET_MACHINE).exe
 # a portable version work, as the C runtime doesn't have to be
 # installed on the target machine.
 #
-MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 8\VC\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC80.CRT\*.*
+MSVCR_DLL=$(VCINSTALLDIR)\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC80.CRT\*.*
 
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008EE"
 #
@@ -1200,7 +1213,7 @@ VCREDIST_EXE=$(VCREDIST_DIR)\vcredist_$(TARGET_MACHINE).exe
 # a portable version work, as the C runtime doesn't have to be
 # installed on the target machine.
 #
-MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC90.CRT\*.*
+MSVCR_DLL=$(VCINSTALLDIR)\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC90.CRT\*.*
 
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2010EE"
 #
@@ -1212,6 +1225,7 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(PROCESSOR_ARC
 # vcredist_x86.exe or vcredist_x64.exe, from Microsoft first, and copy
 # it to the lib folder!!!
 VCREDIST_EXE=$(VCREDIST_DIR)\vcredist_$(TARGET_MACHINE).exe
+
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2010"
 #
 # For MSVC 2010 non-Express Edition, we "Install a particular Visual C++
@@ -1226,7 +1240,7 @@ VCREDIST_EXE=$(VCREDIST_DIR)\vcredist_$(TARGET_MACHINE).exe
 # C++ assembly as a private assembly for the application", starting
 # with Visual Studio 2010.
 #
-MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 10.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC100.CRT\*.*
+MSVCR_DLL=$(VCINSTALLDIR)\redist\$(TARGET_MACHINE)\Microsoft.VC100.CRT\*.*
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE"
 #
 # EE version added as per bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9227
@@ -1243,7 +1257,7 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 10.0\VC\redist\$(TARGET_MACHI
 # C++ assembly as a private assembly for the application", starting
 # with Visual Studio 2010.
 #
-MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 11.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC110.CRT\*.*
+MSVCR_DLL=$(VCINSTALLDIR)\redist\$(TARGET_MACHINE)\Microsoft.VC110.CRT\*.*
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2013" || "$(MSVC_VARIANT)" == "MSVC2013EE"
 #
 # EE version added as per bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9227
@@ -1260,7 +1274,7 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 11.0\VC\redist\$(TARGET_MACHI
 # C++ assembly as a private assembly for the application", starting
 # with Visual Studio 2010.
 #
-MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 12.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC120.CRT\*.*
+MSVCR_DLL=$(VCINSTALLDIR)\redist\$(TARGET_MACHINE)\Microsoft.VC120.CRT\*.*
 !ELSE
 !ERROR MSVC_VARIANT unknown
 !ENDIF
@@ -1305,17 +1319,6 @@ FOP=$(WIRESHARK_LIB_DIR)\fop-1.0\fop.bat
 # Additional options to fop.
 FOP_OPTS=-Xmx256m
 
-# html to text converter for text version of release notes, e.g. elinks.
-# This could also be "lynx", or "true" if neither elinks nor lynx is installed
-# (cygwin: lynx works, elinks not available, links and true doesn't produce output)
-#HTML2TXT=elinks -dump -dump-width 72
-##HTML2TXT=links -dump -width 72 ## XXX: Fails: For links -dump requires 'url' (filename) arg.
-#HTML2TXT=lynx -dump -width=72 -nolist -stdin
-
-!IFNDEF HTML2TXT
-HTML2TXT=$(PYTHON) $(TOOLS_DIR)\html2text.py --width=72 --no-links
-!ENDIF
-
 # the XSL processor (part of cygwin's libxslt package)
 XSLTPROC="xsltproc"
 
@@ -1567,7 +1570,7 @@ PCAP_SETSAMPLING_CONFIG=
 
 !IFDEF ZLIB_DIR
 ZLIB_PATH=$(ZLIB_DIR)
-ZLIB_CFLAGS=/I$(ZLIB_DIR)\include
+ZLIB_CFLAGS=/I$(ZLIB_DIR)
 ZLIB_LIBS=$(ZLIB_DIR)\lib\zdll.lib
 ZLIB_DLL=$(ZLIB_DIR)\zlib1.dll
 # Nmake uses carets to escape special characters