From Chris Maynard via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6134 :
authormorriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 18 Sep 2012 21:52:00 +0000 (21:52 +0000)
committermorriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 18 Sep 2012 21:52:00 +0000 (21:52 +0000)
Add VERSION_MAJOR, VERSION_MINOR, and VERSION_MICRO to the config.h on
Windows (actually Chris' patch included VERSION_BUILD and VERSION_EXTRA but
I've left those out to match what we have on *NIX now).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44988 f5534014-38df-0310-8fa8-9805f1628bb7

Makefile.nmake
config.h.win32

index f3a11504ff7877aa8744135e5895a6714f42f5d4..6c51252c1ab09588be68d59c442d1094b2029c05 100644 (file)
@@ -387,6 +387,9 @@ dumpcap.exe : $(LIBS_CHECK) config.h $(dumpcap_OBJECTS) wsutil\libwsutil.lib ima
 
 config.h       : config.h.win32 config.nmake
        sed -e s/@VERSION@/$(VERSION)/ \
+           -e s/@VERSION_MAJOR@/$(VERSION_MAJOR)/ \
+           -e s/@VERSION_MINOR@/$(VERSION_MINOR)/ \
+           -e s/@VERSION_MICRO@/$(VERSION_MICRO)/ \
            -e "s/@HAVE_C_ARES@/$(C_ARES_CONFIG)/" \
            -e "s/@HAVE_GNU_ADNS@/$(ADNS_CONFIG)/" \
            -e "s/@HAVE_KFW@/$(KFW_CONFIG)/" \
index c1acfd936be0ce2a5783f72ce95e3be284d3fbb8..bfeb73a0766a6b3fcb30f457b4fc377ada9656e1 100644 (file)
 /* Version number of package */
 #define VERSION "@VERSION@"
 
+/* Broken down version */
+#define VERSION_MAJOR @VERSION_MAJOR@
+#define VERSION_MINOR @VERSION_MINOR@
+#define VERSION_MICRO @VERSION_MICRO@
+
 /* We shouldn't need this under Windows but we'll define it anyway. */
 #define HTML_VIEWER "mozilla"