diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2006-04-20 20:35:58 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2006-04-20 20:35:58 +0000 |
| commit | 39674fa5328c104ac4d2199d0a8f11715b8af7be (patch) | |
| tree | 631f02fa934e5bd5e7580c1852edc94740c5d28d /Makefile.nmake | |
| parent | dd44762c875757e13fe98387cccf5b07c89b53ff (diff) | |
| download | wireshark-39674fa5328c104ac4d2199d0a8f11715b8af7be.tar.gz | |
if HHC_DIR is defined in config.nmake, link Ethereal with the required htmlhelp.lib
svn path=/trunk/; revision=17937
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 28d92a142e..3657663ca8 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -49,6 +49,9 @@ EXTRA_OBJECTS = \ ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib shell32.lib comctl32.lib \ $(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib \ +!IFDEF HHC_DIR + $(HHC_DIR)\lib\htmlhelp.lib \ +!ENDIF !IFDEF ENABLE_LIBETHEREAL epan\libethereal.lib \ !ELSE |