From Mike Morrin:

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

diff --git a/config.nmake b/config.nmake
index a89d726ac1615f44a5dab38d832172e35de2eb25..47eef5a101dea5594b625aacdb3b7f1905739050 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -156,22 +156,49 @@ NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe
 # 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
 #
-# If you have the Python interpreter, set this to the directory in which
-# the Python package is stored
-#
-# If you don't have the Python interpreter, comment this line out, so that
-# PYTHON_DIR isn't defined.
+# This will override the automatic detection below.
+#PYTHON_VER=27
+#PYTHON_DIR=C:\Python$(PYTHON_VER)
+
 #
-# V2.4 to V2.6 should work
+# If you don't have the native Python package installed, you can use
+# the Cygwin version (not recommended)
 #
-#PYTHON_VER=26
-#PYTHON_DIR=C:\Python$(PYTHON_VER)
+#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 #####
@@ -201,7 +228,8 @@ FONTCONFIG_DLL=libfontconfig-1.dll
 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.
@@ -210,6 +238,7 @@ GTK_PKG=2.16.6-20100207
 # 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.
@@ -222,7 +251,7 @@ GTK_INST_VERSION=2.16
 #
 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
@@ -409,7 +438,8 @@ EXPAT_DLL=libexpat-1.dll
 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.
@@ -418,6 +448,7 @@ GTK_PKG=2.16.6-20100208
 # 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.
@@ -430,7 +461,7 @@ GTK_INST_VERSION=2.16
 #
 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
@@ -614,12 +645,6 @@ PERL=perl
 POD2MAN=$(SH) pod2man
 POD2HTML=$(SH) pod2html
 
-#
-# If you don't have the native Python package installed, you can use
-# the Cygwin version (not recommended)
-#
-#PYTHON=env python
-
 # command for lex/flexx (cygwin's flex recommended)
 LEX=flex
 
@@ -688,31 +713,6 @@ UPX=$(WIRESHARK_LIBS)\upx303w\upx.exe
 
 ##### Flags, PATHs and Miscellaneous #####
 
-# 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:\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
-
 # 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
@@ -778,6 +778,7 @@ LOCAL_CFLAGS=$(LOCAL_CFLAGS) /D_BIND_TO_CURRENT_CRT_VERSION=1
 !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
@@ -790,6 +791,15 @@ DLL_LDFLAGS =
 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)
 
 #
@@ -861,7 +871,7 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(VCREDIST_DLL)
 # 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
@@ -962,6 +972,7 @@ GTHREAD_LIBS=$(GTK_DIR)\lib\gthread-$(GLIB_VERSION).lib
 
 # 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 \
@@ -972,8 +983,8 @@ GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \
        $(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
@@ -1027,6 +1038,8 @@ PCAP_BREAKLOOP_CONFIG=
 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=
@@ -1038,6 +1051,8 @@ PCAP_BREAKLOOP_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)
@@ -1059,6 +1074,7 @@ ZLIB_LIBS=$(ZLIB_DIR)\lib\zdll.lib
 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=