Fix build

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

diff --git a/config.nmake b/config.nmake
index 4e61654225550c17cf17db0a181d1cf9bf3b9a7c..6c5dce2ae3232534d3ba5d613945e7220f776510 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -11,7 +11,7 @@
 # It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
 VERSION_MAJOR=0
 VERSION_MINOR=99
-VERSION_MICRO=4
+VERSION_MICRO=5
 # It's recommended to change VERSION_EXTRA for your own custom builds
 # e.g. "-SVN-12345"
 VERSION_EXTRA=
@@ -19,6 +19,7 @@ VERSION_EXTRA=
 # The version of the wiretap library (recommended: leave unchanged)
 WTAP_VERSION_MAJOR=0
 WTAP_VERSION_MINOR=3
+WTAP_VERSION_MICRO=1
 
 
 
@@ -60,16 +61,12 @@ GTK2_DIR=$(WIRESHARK_LIBS)\gtk2
 # (MAJOR + MINOR Version number but without MICRO version number) 
 # These macros are used by the nsis installer script and by the setup target.
 #
-#GTK2_INST_VERSION=2.2
-#PANGO_INST_VERSION=1.2
-#GTK2_INST_VERSION=2.4
-#PANGO_INST_VERSION=1.4
 # GTK 2.6 is the mainline since Ethereal 0.10.14
-GTK2_INST_VERSION=2.6
-PANGO_INST_VERSION=1.8
+#GTK2_INST_VERSION=2.6
+#PANGO_INST_VERSION=1.8
 # Support for GTK 2.8 is currently experimental ...
-#GTK2_INST_VERSION=2.8
-#PANGO_INST_VERSION=1.10
+GTK2_INST_VERSION=2.8
+PANGO_INST_VERSION=1.14
 
 #
 # If you have GTK-Wimp, set this to the pathname of the directory in
@@ -82,7 +79,6 @@ PANGO_INST_VERSION=1.8
 # (in this case these GTK-Wimp related settings will have no effect)
 #
 GTK_WIMP_DIR=$(WIRESHARK_LIBS)\gtk-wimp\gtk-wimp-0.7.0-bin
-GTK_THEME_DIR=$(GTK_WIMP_DIR)\Theme\gtk-2.0
 
 #
 # Optional: WinPcap developer's pack to capture network traffic.
@@ -161,7 +157,7 @@ PCRE_DIR=$(WIRESHARK_LIBS)\pcre-6.4
 # If you don't have GNUTLS, comment this line out, so that GNUTLS_DIR
 # isn't defined.
 #
-GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-1.5.0-1
+GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-1.5.1-1
 
 #
 # Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
@@ -206,6 +202,8 @@ LUA_DIR=$(WIRESHARK_LIBS)\lua5.1
 # PORTAUDIO_DIR isn't defined.
 #
 PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1
+#PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19
+
 #
 # Version number of PortAudio
 # 
@@ -226,7 +224,8 @@ ICONV_DIR=$(WIRESHARK_LIBS)\libiconv-1.9.1.bin.woe32
 # Set GETTEXT_DIR to the directory in which the
 # GETTEXT include files and library resides.
 #
-GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.13.1
+#GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.13.1
+GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5
 
 #
 # Optional: AirPcap developer's pack to capture wireless network traffic 
@@ -238,7 +237,7 @@ GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.13.1
 # If you don't have the AirPcap developer's pack, comment this line out, 
 # so that AIRPCAP_DIR isn't defined.
 #
-# AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap
+AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap
 
 
 
@@ -396,8 +395,8 @@ LINK_PLUGINS_WITH_LIBWIRESHARK=USE
 VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)$(VERSION_EXTRA)
 RC_VERSION=$(VERSION_MAJOR),$(VERSION_MINOR),$(VERSION_MICRO)
 
-WTAP_VERSION=$(WTAP_VERSION_MAJOR).$(WTAP_VERSION_MINOR)
-RC_WTAP_VERSION=$(WTAP_VERSION_MAJOR),$(WTAP_VERSION_MINOR)
+WTAP_VERSION=$(WTAP_VERSION_MAJOR).$(WTAP_VERSION_MINOR).$(WTAP_VERSION_MICRO)
+RC_WTAP_VERSION=$(WTAP_VERSION_MAJOR),$(WTAP_VERSION_MINOR),$(WTAP_VERSION_MICRO)
 
 
 GLIB_CFLAGS=/I$(GLIB_DIR)\include\glib-$(GLIB_VERSION) \
@@ -432,18 +431,24 @@ GTK2_LIBS=$(GTK2_DIR)\lib\gtk-win32-2.0.lib \
 GTK2_LIB_DIR=2.4.0
 NEED_LIBPNG_DLL=USE
 NEED_CAIRO_DLL=USE
-GTK_WIMP_DIR=$(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\engines
-GTK_THEME_DIR=$(GTK2_DIR)\share\themes\MS-Windows\gtk-2.0
+GTK_WIMP_DIR=DUMMY_TO_USE_WIMP
+GTK_WIMP_DLLSRC_DIR=$(GTK2_DIR)\lib\gtk-2.0\2.4.0\engines
+GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\2.4.0\engines
+GTK_WIMP_RCSRC_DIR=$(GTK2_DIR)\share\themes\MS-Windows\gtk-2.0
+GTK_WIMP_RCDST_DIR=etc\gtk-2.0
 !ELSEIF "$(GTK2_INST_VERSION)" == "2.6"
 GTK2_LIB_DIR=2.4.0
-!ELSEIF "$(GTK2_INST_VERSION)" == "2.4"
-GTK2_LIB_DIR=2.4.0
-!ELSEIF "$(GTK2_INST_VERSION)" == "2.2"
-GTK2_LIB_DIR=2.2.0
+GTK_WIMP_DLLSRC_DIR=$(GTK_WIMP_DIR)
+GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\2.4.0\engines
+GTK_WIMP_RCSRC_DIR=$(GTK_WIMP_DIR)\Theme\gtk-2.0
+GTK_WIMP_RCDST_DIR=share\themes\Default\gtk-2.0
+GTK_THEME_DIR=$(GTK_WIMP_DIR)\Theme\gtk-2.0
 !ENDIF
 
-# the lib dir of PANGO didn't changed since 1.4.0
-!IF "$(PANGO_INST_VERSION)" == "1.10"
+# the lib dir of PANGO changed in 1.12
+!IF "$(PANGO_INST_VERSION)" == "1.14"
+PANGO_LIB_DIR=1.5.0
+!ELSEIF "$(PANGO_INST_VERSION)" == "1.10"
 PANGO_LIB_DIR=1.4.0
 !ELSEIF "$(PANGO_INST_VERSION)" == "1.8"
 PANGO_LIB_DIR=1.4.0
@@ -581,7 +586,7 @@ LIBGCRYPT_CONFIG=
 
 !IFDEF LUA_DIR
 LUA_CFLAGS=/I$(LUA_DIR)\include
-LUA_LIBS=$(LUA_DIR)\lib\vc6\lua5.1.lib
+LUA_LIBS=$(LUA_DIR)\lib\dll\lua5.1.lib
 # Nmake uses carets to escape special characters
 LUA_CONFIG=^#define HAVE_LUA 1
 LUA_VERSION=^#define HAVE_LUA_5_1 1
@@ -592,13 +597,16 @@ LUA_CONFIG=
 !ENDIF
 
 !IFDEF PORTAUDIO_DIR
-PORTAUDIO_CFLAGS=/I$(PORTAUDIO_DIR)\pa_common
 # Nmake uses carets to escape special characters
 PORTAUDIO_CONFIG=^#define HAVE_LIBPORTAUDIO 1
 !IF "$(PORTAUDIO_VERSION)" == "18"
 # V18 uses API version 1 and v19 API version 2
+PORTAUDIO_CFLAGS=/I$(PORTAUDIO_DIR)\pa_common
 PORTAUDIO_API_CONFIG=^#define PORTAUDIO_API_1 1
+!ELSE
+PORTAUDIO_CFLAGS=/I$(PORTAUDIO_DIR)\include /I$(PORTAUDIO_DIR)\src\common
 !ENDIF
+
 !else
 PORTAUDIO_CFLAGS=
 PORTAUDIO_CONFIG=