aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/nsis/Makefile.nmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2012-04-04 00:47:21 +0000
committerGerald Combs <gerald@wireshark.org>2012-04-04 00:47:21 +0000
commit16a4af2d6755d2ca5af2bb8bd24442b4dd40e933 (patch)
treeeee37dfe3997f0f236b71e9c3ed7437a6c7acb2a /packaging/nsis/Makefile.nmake
parent65a42ddd9ad1fff0ea10b51856b905b7715a4a84 (diff)
Add and update a bunch of Programs and Features-related registry
keys. Sort the keys by name. Calculate the installation size after all of the files have been installed and add that in the "EstimatedSize" key. Fix the display icon. Add a hint about our target platform. Add version information. We now look like a grown-up application in the Programs and Features control panel. svn path=/trunk/; revision=41914
Diffstat (limited to 'packaging/nsis/Makefile.nmake')
-rw-r--r--packaging/nsis/Makefile.nmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index d005b1d9c9..1af5bf38fe 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -137,6 +137,10 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(
/DGTK_WIMP_RCSRC_DIR=$(GTK_WIMP_RCSRC_DIR) \
/DINTL_DLL=$(INTL_DLL) \
/DVERSION=$(VERSION) \
+ /DVERSION_MAJOR=$(VERSION_MAJOR) \
+ /DVERSION_MINOR=$(VERSION_MINOR) \
+ /DVERSION_MICRO=$(VERSION_MICRO) \
+ /DVERSION_BUILD=$(VERSION_BUILD) \
/DPRODUCT_VERSION=$(PRODUCT_VERSION) \
/DWTAP_VERSION=$(WTAP_VERSION) \
!IF "$(C_ARES_DIR)" != ""