From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes

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

diff --git a/config.nmake b/config.nmake
index d3d581cea1521a6a83768719494016cc67e2be9e..fd84500a75842fc8612eb0134d6ac48919709577 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -12,22 +12,25 @@ WIRESHARK_TARGET_PLATFORM=win32
 
 ##### Versions #####
 
-# The current Wireshark version
-# It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
+# The SVN revision of our build. Updated by make-version.pl
+SVN_REVISION=0
+
+# The current Wireshark version. Recommended: Leave unchanged.
+# Updated by make-version.pl
 VERSION_MAJOR=1
 VERSION_MINOR=7
-VERSION_MICRO=0
-VERSION_BUILD=0
-# It's recommended to change VERSION_EXTRA for your own custom builds
-# e.g. "-SVN-12345"
-VERSION_EXTRA=
+VERSION_MICRO=1
+VERSION_BUILD=$(SVN_REVISION)
 
-# The version of the wiretap library (recommended: leave unchanged)
-WTAP_VERSION_MAJOR=1
-WTAP_VERSION_MINOR=7
-WTAP_VERSION_MICRO=0
+# Local build information. Recommended: Unique string for your
+# environment, e.g. "-JackStackBarbecue". Updated by make-version.pl
 
+VERSION_EXTRA=
 
+# The version of the wiretap library. Recommended: Leave unchanged.
+WTAP_VERSION_MAJOR=$(VERSION_MAJOR)
+WTAP_VERSION_MINOR=$(VERSION_MINOR)
+WTAP_VERSION_MICRO=0
 
 ##### Directories #####