diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-03-26 20:17:42 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-03-26 20:17:42 +0000 |
| commit | 458e915b901a8ca556e753671a607486dd7c99f2 (patch) | |
| tree | 0b6aa47d76a630705d62d517ea7307966d946b9b | |
| parent | 7a5e0860a2b89b1a811d3703cfe1a212922240b8 (diff) | |
| download | wireshark-458e915b901a8ca556e753671a607486dd7c99f2.tar.gz wireshark-458e915b901a8ca556e753671a607486dd7c99f2.tar.bz2 wireshark-458e915b901a8ca556e753671a607486dd7c99f2.zip | |
From Graham Bloice: make the RC_VERSION variable in config.nmake
comma-separated, so that the resources will be built correctly and the
version number correctly displayed in the GUI, and make the resources
dependent on "config.nmake" so that they're rebuilt if it's changed.
svn path=/trunk/; revision=7373
| -rw-r--r-- | config.nmake | 4 | ||||
| -rw-r--r-- | image/Makefile.nmake | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/config.nmake b/config.nmake index 6e25bb87a2..8631147465 100644 --- a/config.nmake +++ b/config.nmake @@ -1,7 +1,7 @@ -# $Id: config.nmake,v 1.36 2003/03/11 00:12:35 gerald Exp $ +# $Id: config.nmake,v 1.37 2003/03/26 20:17:40 guy Exp $ VERSION=0.9.11 -RC_VERSION=0.9.11 +RC_VERSION=0,9,11 WTAP_VERSION=0.0 GTK_VERSION=1.3 diff --git a/image/Makefile.nmake b/image/Makefile.nmake index b97c84f6c0..ba7ef43df0 100644 --- a/image/Makefile.nmake +++ b/image/Makefile.nmake @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake,v 1.4 2001/07/12 21:02:06 guy Exp $ +# $Id: Makefile.nmake,v 1.5 2003/03/26 20:17:42 guy Exp $ # include ..\config.nmake @@ -7,27 +7,27 @@ include ..\config.nmake ALL_RC=ethereal.rc tethereal.rc editcap.rc text2pcap.rc mergecap.rc all : $(ALL_RC) -ethereal.rc : ethereal.rc.in +ethereal.rc : ethereal.rc.in ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ < ethereal.rc.in > $@ -tethereal.rc : tethereal.rc.in +tethereal.rc : tethereal.rc.in ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ < tethereal.rc.in > $@ -editcap.rc : editcap.rc.in +editcap.rc : editcap.rc.in ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ < editcap.rc.in > $@ -mergecap.rc : mergecap.rc.in +mergecap.rc : mergecap.rc.in ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ < mergecap.rc.in > $@ -text2pcap.rc : text2pcap.rc.in +text2pcap.rc : text2pcap.rc.in ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ < text2pcap.rc.in > $@ |