# The current Wireshark version
# It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
VERSION_MAJOR=1
-VERSION_MINOR=3
-VERSION_MICRO=6
+VERSION_MINOR=5
+VERSION_MICRO=0
VERSION_BUILD=0
# It's recommended to change VERSION_EXTRA for your own custom builds
# e.g. "-SVN-12345"
#
NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe
+#
+# Optional: the Python library enables scripting support.
+#
+# If you don't have the Python library, comment this line out, so that
+# PYTHON_EMBED isn't defined.
+#
+# NOTE: The Python library must have been compiled with the same
+# compiler (MSVC_VARIANT) as Wireshark. Kown python.org Python
+# CRT versions:
+#
+# Python version CRT (32-bit) CRT (64-bit)
+# 2.4.4 7.1 ?
+# 2.6.1 9.0 ?
+# 2.6.2 9.0
+#
+# If you versions of Python and Visual C++ use different CRTs
+# comment this out.
+#
+# XXX The DLL path in epan/wspython/wspy_libws.py likely needs to
+# be fixed before this is enabled by default.
+#PYTHON_EMBED=1
+
+#
+# Optional: the Python interpreter is used as part of the buildsystem
+#
+# This will override the automatic detection below.
+#PYTHON_VER=27
+#PYTHON_DIR=C:\Python$(PYTHON_VER)
+
+#
+# If you don't have the native Python package installed, you can use
+# the Cygwin version (not recommended)
+#
+#PYTHON=env python
+
+# Santity check: native vs Cygwin Python options
+!IF DEFINED(PYTHON) && DEFINED(PYTHON_DIR)
+!ERROR PYTHON and PYTHON_DIR cannot be specified at the same time
+!ENDIF
+
+# Find native Python automatically if PYTHON(_DIR) wasn't defined
+!IF !DEFINED(PYTHON) && !DEFINED(PYTHON_DIR)
+!IF EXIST(c:\Python27\python.exe)
+PYTHON_VER=27
+!ELSE IF EXIST(c:\Python26\python.exe)
+PYTHON_VER=26
+!ELSE IF EXIST(c:\Python25\python.exe)
+PYTHON_VER=25
+!ELSE IF EXIST(c:\Python24\python.exe)
+PYTHON_VER=24
+!ENDIF
+
+!IF DEFINED(PYTHON_VER)
+PYTHON_DIR=C:\Python$(PYTHON_VER)
+!ENDIF
+!ENDIF
+
+!IF DEFINED(PYTHON_DIR)
+PYTHON="$(PYTHON_DIR)\python.exe"
+PATH=$(PYTHON_DIR);$(PATH)
+!ENDIF
!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
##### Win32 Libraries #####
#
GLIB_VERSION=2.0
-##### To Use new packet list uncomment this line ####
-### Warning Experimental - work in progress
+##### To use the old packet list comment out this line ####
NEW_PACKET_LIST_CONFIG=^#define NEW_PACKET_LIST 1
#
EXPAT_DLL=libexpat-1.dll
INTL_DLL=intl.dll
# This macro is used by the setup target.
-GTK_PKG=2.16.6-20100207
+GTK_PKG=2.16.6-20100912
+#GTK_PKG=2.22.0-20101016
#
# Mandatory: Version numbers of GTK and pango.
# These macros are used by the nsis installer script and by the setup target.
#
GTK_INST_VERSION=2.16
+#GTK_INST_VERSION=2.22
#
# Optional: WinPcap developer's pack to capture network traffic.
#
PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
# This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
-PCAP_VERSION=4_1_1
+PCAP_VERSION=4_1_2
#
# Optional: WinPcap remote capture support and new API
#
GLIB_VERSION=2.0
-##### To Use new packet list uncomment this line ####
-### Warning Experimental - work in progress
+##### To use the old packet list comment out this line ####
NEW_PACKET_LIST_CONFIG=^#define NEW_PACKET_LIST 1
#
INTL_DLL=libintl-8.dll
# These macros are used by the setup target.
-GTK_PKG=2.16.6-20100208
+GTK_PKG=2.16.6-20100912
+#GTK_PKG=2.22.0-20101016
#
# Mandatory: Version numbers of GTK and pango.
# These macros are used by the nsis installer script and by the setup target.
#
GTK_INST_VERSION=2.16
+#GTK_INST_VERSION=2.22
#
# Optional: WinPcap developer's pack to capture network traffic.
#
PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
# This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
-PCAP_VERSION=4_1_1
+PCAP_VERSION=4_1_2
#
# Optional: WinPcap remote capture support and new API
POD2MAN=$(SH) pod2man
POD2HTML=$(SH) pod2html
-# Command for native Windows Python (recommended)
-# V2.4 to V2.6 should work
-
-# If you want to specify your Python settings, uncomment the lines below.
-#PYTHON="C:\Python26\python.exe"
-#PATH=c:\Python26;$(PATH)
-
-# Command for Cygwin's Python (not recommended)
-#PYTHON=env python
-
-# Otherwise, find Python automatically.
-!IF !DEFINED(PYTHON)
-!IF EXIST(c:\Python26\python.exe)
-PYTHON="C:\Python26\python.exe"
-PATH=c:\Python26;$(PATH)
-!ELSE IF EXIST(c:\Python25\python.exe)
-PYTHON="C:\Python25\python.exe"
-PATH=c:\Python25;$(PATH)
-!ELSE IF EXIST(c:\Python24\python.exe)
-PYTHON="C:\Python24\python.exe"
-PATH=c:\Python24;$(PATH)
-!ENDIF
-!ENDIF
-
# command for lex/flexx (cygwin's flex recommended)
LEX=flex
##### Flags, PATHs and Miscellaneous #####
+# Santity check: Python embedding requires a valid PYTHON_DIR
+!IF DEFINED(PYTHON_EMBED) && !DEFINED(PYTHON_DIR)
+!ERROR PYTHON_EMBED requires that PYTHON_DIR is defined
+!ENDIF
+
# "convert" the MSVC variant into the required MSC compiler version
!IF "$(MSVC_VARIANT)" == "MSVC6"
MSC_VER_REQUIRED=1200
!IF "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE" || "$(MSVC_VARIANT)" == "MSVC2010" || "$(MSVC_VARIANT)" == "MSVC2010EE"
LOCAL_CFLAGS= $(LOCAL_CFLAGS) /MP
!ENDIF
+
# Linker flags:
# /DEBUG generate debug info
# /PROFILE generate map file(s) for profiling
DLL_LDFLAGS = /MANIFEST:no
!ENDIF
+# Enable ASLR. Requires VS2008 or later.
+# http://blogs.msdn.com/b/vcblog/archive/2009/05/21/dynamicbase-and-nxcompat.aspx
+# DEP is handled in init_process_policies()
+
+# ASLR http://msdn.microsoft.com/en-us/library/bb384887.aspx
+!IF $(MSC_VER_REQUIRED) >= 1500
+LOCAL_LDFLAGS= $(LOCAL_LDFLAGS) /DYNAMICBASE
+!ENDIF
+
PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no $(LOCAL_LDFLAGS) $(DLL_LDFLAGS)
#
# and copy it to the lib folder!!!
VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_$(TARGET_MACHINE).exe
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2010"
-MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 10.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC100.CRT*.*
+MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 10.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC100.CRT\*.*
!ELSE
!ERROR MSVC_VARIANT unknown
# GTK+
GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-2.0 \
+ /I$(GTK_DIR)\include\gdk-pixbuf-2.0 \
/I$(GTK_DIR)\lib\gtk-2.0\include \
/I$(GTK_DIR)\include\atk-1.0 \
/I$(GTK_DIR)\include\cairo \
$(GTK_DIR)\lib\pango-1.0.lib \
$(GLIB_LIBS)
-
-!IF "$(GTK_INST_VERSION)" == "2.18" || "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14"
+# 2.18 was no good(Theming problem)
+!IF "$(GTK_INST_VERSION)" == "2.22" || "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14"
GTK_LIB_DIR=2.10.0
!IFDEF PNG_DLL
PCAP_LIST_DATALINKS_CONFIG=^#define HAVE_PCAP_LIST_DATALINKS 1
PCAP_FREE_DATALINKS_CONFIG=^#define HAVE_PCAP_FREE_DATALINKS 1
PCAP_SET_DATALINK_CONFIG=^#define HAVE_PCAP_SET_DATALINK 1
+PCAP_OPEN_DEAD_CONFIG=^#define HAVE_PCAP_OPEN_DEAD 1
+BPF_IMAGE_CONFIG=^#define HAVE_BPF_IMAGE 1
!ELSE
# no WpdPack installed
WINPCAP_CONFIG=
PCAP_LIST_DATALINKS_CONFIG=
PCAP_FREE_DATALINKS_CONFIG=
PCAP_SET_DATALINK_CONFIG=
+PCAP_OPEN_DEAD_CONFIG=
+BPF_IMAGE_CONFIG=
!ENDIF
!IF DEFINED(PCAP_DIR) && DEFINED(PCAP_REMOTE)
ZLIB_DLL=$(ZLIB_DIR)\zlib1.dll
# Nmake uses carets to escape special characters
ZLIB_CONFIG=^#define HAVE_LIBZ 1
+ZLIB_GZCLEARERR_CONFIG=^#define HAVE_GZCLEARERR 1
!else
ZLIB_CFLAGS=
ZLIB_LIBS=
LUA_CONFIG=
!ENDIF
+!IF DEFINED(PYTHON_EMBED)
+PYTHON_CFLAGS=/I$(PYTHON_DIR)\include
+PYTHON_LIBS=$(PYTHON_DIR)\libs\python$(PYTHON_VER).lib
+# Nmake uses carets to escape special characters
+PYTHON_CONFIG=^#define HAVE_PYTHON 1
+!else
+PYTHON_CFLAGS=
+PYTHON_LIBS=
+PYTHON_CONFIG=
+!ENDIF
+
!IFDEF PORTAUDIO_DIR
# Nmake uses carets to escape special characters
PORTAUDIO_CONFIG=^#define HAVE_LIBPORTAUDIO 1
git.samba.org / obnox / wireshark / wip.git / blobdiff