Update release number.

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

diff --git a/config.nmake b/config.nmake
index ba6fe03f52ebfe58dd5465a8c1652bcc2d5523ce..f21171dddd5c5dfa03ab0daeb31eb4e4b11b9a9f 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -15,8 +15,8 @@ PLATFORM=win32
 # 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=2
 VERSION_BUILD=0
 # It's recommended to change VERSION_EXTRA for your own custom builds
 # e.g. "-SVN-12345"
@@ -145,7 +145,7 @@ 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
+GTK_INST_VERSION=2.14
 PANGO_INST_VERSION=1.20
 
 #
@@ -205,7 +205,7 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123
 # 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.5.2ws
+C_ARES_DIR=$(WIRESHARK_LIBS)\c-ares-1.5.3ws
 
 #
 # Optional: the PCRE (Perl Compatible Regular Expressions) library
@@ -446,11 +446,12 @@ MSC_VER_REQUIRED=1500
 # /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_BIND_TO_CURRENT_CRT_VERSION=1 Make sure our CRT and manifest versions match (http://msdn.microsoft.com/en-us/library/cc664727.aspx)
 #
 !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)
 !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 /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) /D_BIND_TO_CURRENT_CRT_VERSION=1
 !ELSE
 !ERROR MSVC_VARIANT unknown
 !ENDIF
@@ -624,7 +625,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
@@ -634,9 +635,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