diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-09-19 00:47:31 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-09-19 00:47:31 +0000 |
| commit | 4a57360291672342936cc66da056b63aa04b2cc5 (patch) | |
| tree | 90a1243de2dce38d177de98b152f28ad2763ec84 | |
| parent | 0a04950fe76f67e4dab65d1730bef7f330808fee (diff) | |
Use guilibsdll and htmlhelp.lib in the Qt build.
svn path=/trunk/; revision=44996
| -rw-r--r-- | Makefile.nmake | 4 | ||||
| -rw-r--r-- | ui/qt/QtShark.pro | 2 |
2 files changed, 5 insertions, 1 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:\=/)" diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index 8e58514e75..25a03ce271 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -314,7 +314,7 @@ win32 { LIBS += $$OBJECTS_WS_C LIBS += $$PA_OBJECTS LIBS += \ - wsock32.lib user32.lib shell32.lib comctl32.lib comdlg32.lib \ + $${guilibsdll} $${HHC_LIBS} \ -L../../epan -llibwireshark -L../../wsutil -llibwsutil -L../../wiretap -lwiretap-$${WTAP_VERSION} \ -L.. -llibui \ -L$${GLIB_DIR}/lib -lglib-2.0 -lgmodule-2.0 |