aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2012-09-19 00:47:31 +0000
committerGerald Combs <gerald@wireshark.org>2012-09-19 00:47:31 +0000
commit4a57360291672342936cc66da056b63aa04b2cc5 (patch)
tree90a1243de2dce38d177de98b152f28ad2763ec84 /Makefile.nmake
parent0a04950fe76f67e4dab65d1730bef7f330808fee (diff)
Use guilibsdll and htmlhelp.lib in the Qt build.
svn path=/trunk/; revision=44996
Diffstat (limited to 'Makefile.nmake')
-rw-r--r--Makefile.nmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index 6c51252c1a..e4b95a7e5e 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -455,6 +455,10 @@ GEOIP_DIR = $(GEOIP_DIR:\=/)
INTL_DLL = $(INTL_DLL)
+guilibsdll = $(guilibsdll)
+
+HHC_LIBS = $(HHC_LIBS)
+
MSVC_VARIANT = $(MSVC_VARIANT)
MSVCR_DLL = "$(MSVCR_DLL:\=/)"