diff options
| author | Bill Meier <wmeier@newsguy.com> | 2008-02-14 17:16:12 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2008-02-14 17:16:12 +0000 |
| commit | 718b14c7ce8dceb7faa6a6c22dbe197f6dabfbb9 (patch) | |
| tree | 87bcc9cbb938b9ecdacb038c74ab2a9dbd66e428 /epan/Makefile.nmake | |
| parent | ba11df88da796bec3b3e7413a88ba8ab18a25696 (diff) | |
Glib >= 2.14.5 does not require iconv
svn path=/trunk/; revision=24330
Diffstat (limited to 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index e875457666..1698be2b32 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -37,7 +37,9 @@ libwireshark_LIBS = \ $(LUA_LIBS) \ $(SMI_LIBS) \ ..\wiretap\wiretap-$(WTAP_VERSION).lib \ +!IFDEF ICONV_DIR $(ICONV_DIR)\lib\iconv.lib \ +!ENDIF crypt\airpdcap.lib \ ftypes\ftypes.lib \ dfilter\dfilter.lib \ |