gtk_label_set -> gtk_label_set_text

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

diff --git a/config.nmake b/config.nmake
index 0a3302adffc42b68fe61e3c78dfef8c4a577e519..bda2183f0f30f4f4d47ff60baec0051095071ce9 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -3,15 +3,20 @@
 # Some more informations about the settings in this file, can be found
 # in the file README.win32 and the Developer's Guide (available online).
 
-
+##### Target platform #####
+# Only "win32" is valid (for now).
+# This can be defined in the system environment.
+!IFNDEF PLATFORM
+PLATFORM=win32
+!ENDIF
 
 ##### Versions #####
 
 # The current Wireshark version
 # It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
 VERSION_MAJOR=1
-VERSION_MINOR=0
-VERSION_MICRO=99
+VERSION_MINOR=1
+VERSION_MICRO=3
 VERSION_BUILD=0
 # It's recommended to change VERSION_EXTRA for your own custom builds
 # e.g. "-SVN-12345"
@@ -30,14 +35,33 @@ WTAP_VERSION_MICRO=1
 # Base directory, where your libraries reside, which are needed to
 # compile the sources. This setting is used only inside this file.
 #
-WIRESHARK_LIBS=C:\wireshark-win32-libs
+WIRESHARK_LIBS=C:\wireshark-$(PLATFORM)-libs
 
 #
 # Base directory, where your programs reside.
 # This setting is used only inside this file.
 #
-PROGRAM_FILES=C:/Program Files
+PROGRAM_FILES=$(PROGRAMFILES)
+
+#
+# Location of the "tools" directory. This affects HTML2TXT below and should
+# be overridden by makefiles in any subdirectories that use HTML2TXT.
+!IFNDEF TOOLS_DIR
+TOOLS_DIR=tools
+!ENDIF
 
+#
+# Machine type for the compiler and linker
+# TARGET_MACHINE (Used for link /MACHINE) should be one of "X86" or "X64"
+# (sorry ARM, Alpha, MIPS, and Itanium fans).
+# CPU (Used by win32.mak) should be one of "i386" or "AMD64".
+!if "$(PLATFORM)" == "win32"
+TARGET_MACHINE=X86
+CPU=i386
+!else if "$(PLATFORM)" == "win64"
+TARGET_MACHINE=X64
+CPU=AMD64
+!endif
 
 
 ##### Microsoft Visual C / Studio Variant #####
@@ -128,8 +152,8 @@ GTK_DIR=$(WIRESHARK_LIBS)\gtk2
 # These macros are used by the nsis installer script and by the setup target.
 #
 # GTK 2.12 is the mainline since Wireshark 0.99.7
-GTK_INST_VERSION=2.12
-PANGO_INST_VERSION=1.20
+GTK_INST_VERSION=2.14
+PANGO_INST_VERSION=1.22
 
 #
 # Optional: WinPcap developer's pack to capture network traffic.
@@ -170,7 +194,25 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123
 # If you don't have GNU ADNS, comment this line out, so that ADNS_DIR
 # isn't defined.
 #
-ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05ws
+# If C_ARES_DIR is defined below, it will override this setting.
+#
+#ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05ws
+
+#
+# Optional: the c-ares library enables asynchronous (nonblocking) DNS
+# name resolvings.
+#
+# If you have c-ares, set this to the directory in which the c-ares
+# .lib file is stored. Setting this will override ADNS_DIR above. You
+# can't have both.
+#
+# If you're using Visual C++ 6.0, you'll have to use a platform SDK that
+# defines socklen_t, such as Windows Server 2003 PSDK.
+#
+# If you don't have c-ares, comment this line out, so that C_ARES_DIR
+# isn't defined.
+#
+C_ARES_DIR=$(WIRESHARK_LIBS)\c-ares-1.6.0ws
 
 #
 # Optional: the PCRE (Perl Compatible Regular Expressions) library
@@ -194,8 +236,8 @@ PCRE_DIR=$(WIRESHARK_LIBS)\pcre-7.0
 # isn't defined.
 #
 # Platform SDK conflicts with openssl.h header
-#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-1.6.1-1
-GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.3.8-1
+#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.6.3-1
+GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.6.4-1
 
 #
 # Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
@@ -228,7 +270,7 @@ KFW_DIR=$(WIRESHARK_LIBS)\kfw-2.5
 # If you don't have LUA, comment this line out, so that LUA_DIR
 # isn't defined.
 #
-LUA_DIR=$(WIRESHARK_LIBS)\lua5.1
+LUA_DIR=$(WIRESHARK_LIBS)\lua5.1.4
 
 #
 # Optional: the PORTAUDIO library enables audio output for RTP streams.
@@ -283,6 +325,17 @@ AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap_Devpack_1_0_0_594\AirPcap_Devpack
 #
 SMI_DIR=$(WIRESHARK_LIBS)\libsmi-0.4.8
 
+#
+# Optional: GeoIP, IP address database lookups
+#
+# Used to map IP addresses to MaxMind GeoIP database entries
+#
+# GeoIP requires IPv6 definitions that don't ship with Visual C++ 6.0.
+# However, the Microsoft Platform SDK for Windows Server 2003 R2 provides
+# these definitions. The SDK's SetEnv.bat script defines INETSDK.
+!IF "$(MSVC_VARIANT)" != "MSVC6" || DEFINED(INETSDK)
+GEOIP_DIR=$(WIRESHARK_LIBS)\GeoIP-1.4.5ws
+!ENDIF
 
 ##### Tools #####
 
@@ -315,17 +368,30 @@ PERL=perl
 POD2MAN=$(SH) pod2man
 POD2HTML=$(SH) pod2html
 
-# command for native windows python (recommended)
-# both V2.4 and V2.5 should work
-PYTHON="C:/python24/python.exe"
-#PYTHON="C:/python25/python.exe"
-# add native python to the path (not needed if cygwin's python is used)
-PATH=c:\python24;$(PATH)
-#PATH=c:\python25;$(PATH)
+# 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 python (cygwin's python package, not recommended)
+# 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
 
@@ -409,13 +475,17 @@ MSC_VER_REQUIRED=1500
 # /W3  warning level 3 (0 less - 4 most, 1 default)
 # /Zi  create .pdb file for debugging
 # /MD  use "Multithreading Debug" libraries
-# /D_CRT_SECURE_NO_DEPRECATE don't warn for "insecure" calls, see MSDN "Security Enhancements in the CRT"
-# /D_CRT_NONSTDC_NO_DEPRECATE don't warn for "Deprecated CRT Functions" as MSDN calls this
+# /D_CRT_SECURE_NO_DEPRECATE        Don't warn for "insecure" calls, see MSDN "Security Enhancements in the CRT"
+# /D_CRT_NONSTDC_NO_DEPRECATE       Don't warn for "Deprecated CRT Functions" as MSDN calls this
+# /D_BIND_TO_CURRENT_CRT_VERSION=1  Make sure our CRT and manifest versions match (http://msdn.microsoft.com/en-us/library/cc664727.aspx)
+# /DWIN32_LEAN_AND_MEAN             Don't include unnecessary Windows include files (see windows.h)
+# /MP [<number of processes>]       [MSVC2008]: Compiles multiple source files by using multiple processes 
+#                                               Add if desired for compile speedup on machines with 2 or more "effective processors"
 #
 !IF "$(MSVC_VARIANT)" == "MSVC6" || "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "DOTNET10" || "$(MSVC_VARIANT)" == "MSVC2003" || "$(MSVC_VARIANT)" == "DOTNET11"
-LOCAL_CFLAGS=/Zi /W3 /MD /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED)
+LOCAL_CFLAGS=/Zi /W3 /MD /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED)
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE"
-LOCAL_CFLAGS=/Zi /W3 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED)
+LOCAL_CFLAGS=/Zi /W3 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) /D_BIND_TO_CURRENT_CRT_VERSION=1
 !ELSE
 !ERROR MSVC_VARIANT unknown
 !ENDIF
@@ -426,9 +496,9 @@ LOCAL_CFLAGS=/Zi /W3 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
 # /DEFAULTLIB:xxx use xxx as the standard C library
 # /NODEFAULTLIB:xxx don't use xxx as the standard C library
 #
-LOCAL_LDFLAGS=/DEBUG
+LOCAL_LDFLAGS=/DEBUG /MACHINE:$(TARGET_MACHINE)
 
-PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
+PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no $(LOCAL_LDFLAGS)
 
 #
 # According to http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=403
@@ -527,8 +597,11 @@ HHC_EXE="$(HHC_DIR)\hhc.exe"
 # (cygwin: lynx works, elinks not available, links and true doesn't produce output)
 #HTML2TXT=elinks -dump -dump-width 72
 #HTML2TXT=links -dump -width 72
-HTML2TXT=lynx -dump -width=72 -nolist -stdin
-#HTML2TXT="true"
+#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"
@@ -589,7 +662,7 @@ GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \
        $(GTK_DIR)\lib\pango-1.0.lib \
        $(GLIB_LIBS)
 
-!IF "$(GTK_INST_VERSION)" == "2.12"
+!IF "$(GTK_INST_VERSION)" == "2.14"
 GTK_LIB_DIR=2.10.0
 NEED_LIBPNG_DLL=USE
 NEED_LIBJPEG_DLL=USE
@@ -599,9 +672,11 @@ GTK_WIMP_DLLSRC_DIR=$(GTK_DIR)\lib\gtk-2.0\2.10.0\engines
 GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\2.10.0\engines
 GTK_WIMP_RCSRC_DIR=$(GTK_DIR)\share\themes\MS-Windows\gtk-2.0
 GTK_WIMP_RCDST_DIR=etc\gtk-2.0
-!ELSEIF "$(GTK_INST_VERSION)" == "2.10"
+!ELSEIF "$(GTK_INST_VERSION)" == "2.12"
 GTK_LIB_DIR=2.10.0
 NEED_LIBPNG_DLL=USE
+NEED_LIBJPEG_DLL=USE
+NEED_LIBTIFF_DLL=USE
 NEED_CAIRO_DLL=USE
 GTK_WIMP_DLLSRC_DIR=$(GTK_DIR)\lib\gtk-2.0\2.10.0\engines
 GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\2.10.0\engines
@@ -611,7 +686,7 @@ GTK_WIMP_RCDST_DIR=etc\gtk-2.0
 !ERROR ? Unknown or invalid GTK_INST_VERSION
 !ENDIF
 
-!IF "$(PANGO_INST_VERSION)" == "1.20"
+!IF "$(PANGO_INST_VERSION)" == "1.22"
 PANGO_LIB_DIR=1.5.0
 !ELSEIF "$(PANGO_INST_VERSION)" == "1.18"
 PANGO_LIB_DIR=1.5.0
@@ -682,6 +757,17 @@ ZLIB_DLL=
 ZLIB_CONFIG=
 !ENDIF
 
+!IFDEF C_ARES_DIR
+!UNDEF ADNS_DIR
+C_ARES_CFLAGS=/I$(C_ARES_DIR)
+C_ARES_LIBS=$(C_ARES_DIR)\cares.lib
+C_ARES_DLL=$(C_ARES_DIR)\cares.dll
+# Nmake uses carets to escape special characters
+C_ARES_CONFIG=^#define HAVE_C_ARES 1
+!else
+C_ARES_CFLAGS=
+C_ARES_LIBS=
+C_ARES_CONFIG=
 !IFDEF ADNS_DIR
 ADNS_PATH=$(ADNS_DIR)\adns_win32\lib
 ADNS_CFLAGS=/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32
@@ -693,7 +779,8 @@ ADNS_CONFIG=^#define HAVE_GNU_ADNS 1
 ADNS_CFLAGS=
 ADNS_LIBS=
 ADNS_CONFIG=
-!ENDIF
+!ENDIF # ADNS
+!ENDIF # C_ARES
 
 !IFDEF KFW_DIR
 KFW_PATH=$(KFW_DIR)\bin
@@ -733,7 +820,7 @@ NETTLE_CONFIG=
 !IFDEF GNUTLS_DIR
 GNUTLS_PATH=$(GNUTLS_DIR)
 # /DNOCRYPT avoids inclusion of Wincrypt.h, avoiding a X509_NAME define clash
-GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT
+GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT /DIMPORT_LIGNUTLSDLL
 GNUTLS_LIBS=\
        $(GNUTLS_DIR)\bin\libtasn1-3.lib        \
        $(GNUTLS_DIR)\bin\libgpg-error-0.lib    \
@@ -751,7 +838,7 @@ LIBGCRYPT_CONFIG=
 
 !IFDEF LUA_DIR
 LUA_CFLAGS=/I$(LUA_DIR)\include
-LUA_LIBS=$(LUA_DIR)\lib\dll\lua5.1.lib
+LUA_LIBS=$(LUA_DIR)\lua5.1.lib
 # Nmake uses carets to escape special characters
 LUA_CONFIG=^#define HAVE_LUA 1
 LUA_VERSION=^#define HAVE_LUA_5_1 1
@@ -799,6 +886,16 @@ SMI_CFLAGS=
 SMI_CONFIG=
 !ENDIF
 
+!IFDEF GEOIP_DIR
+GEOIP_CONFIG=^#define HAVE_GEOIP 1
+GEOIP_CFLAGS=/I$(GEOIP_DIR)\libGeoIP
+GEOIP_LIBS=$(GEOIP_DIR)\libGeoIP\GeoIP.lib
+!ELSE
+GeoIP_LIBS=
+GeoIP_CFLAGS=
+GeoIP_CONFIG=
+!ENDIF
+
 !IFDEF ENABLE_LIBWIRESHARK
 LIBWIRESHARK_CONFIG=^#define HAVE_LIBWIRESHARKDLL 1
 # Link plugins with the import library of libwireshark.dll
@@ -813,3 +910,10 @@ PATH=$(PATH);$(CYGWIN_PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;
 !ELSE
 PATH=$(PATH);$(CYGWIN_PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH)
 !ENDIF
+
+# We can't use a lot of IPv6 code with plain Visual C++ 6.0
+!IF "$(MSVC_VARIANT)" == "MSVC6" && !DEFINED(MSSDK)
+INET6_CONFIG=
+!ELSE
+INET6_CONFIG=^#define INET6 1
+!ENDIF