diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-10-13 21:37:01 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-10-13 20:15:27 +0000 |
| commit | 89a95f22056c1be1e5f6eb6da1520302a3f6b3e0 (patch) | |
| tree | 58018a1d4fd90382a5c07cde030553910977121f /config.nmake | |
| parent | 1f481258da05feb9ff165f586292330427c841a9 (diff) | |
Add Kerberos 3.2.2 package for Win64
Change-Id: If02469aa1a01972d2032478dce3bf872802f37cb
Reviewed-on: https://code.wireshark.org/review/4661
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake index 3c2691bce6..4236cbd2b0 100644 --- a/config.nmake +++ b/config.nmake @@ -431,6 +431,9 @@ GCC_DLL=libgcc_s_sjlj-1.dll # isn't defined. # KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3-2-2-i386-ws-vc6 +COMERR_DLL=comerr32.dll +KRB5_DLL=krb5_32.dll +K5SPRT_DLL=k5sprt32.dll # Optional: the LUA library enables scripting support. # @@ -679,7 +682,10 @@ GCC_DLL=libgcc_s_seh-1.dll # If you don't have KFW, comment this line out, so that KFW_DIR # isn't defined. # -#KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3.2.2-ws1 +KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3-2-2-x64-ws +COMERR_DLL=comerr64.dll +KRB5_DLL=krb5_64.dll +K5SPRT_DLL=k5sprt64.dll # # Optional: the LUA library enables scripting support. @@ -1434,7 +1440,7 @@ NEED_XML_DLL=USE # GTK+ ## Note: If Wireshark is ever to be built with Gtk >= 3.10 ## then -DGTK_DISABLE_DEPRECATED must be removed -## and -DGDK_DISABLE_DEPRECIATION_WARNINGS must +## and -DGDK_DISABLE_DEPRECATION_WARNINGS must ## be added below. ## Wireshark changes to handle Gtk 3.10 deprecated features ## will not be done since Wireshark is moving to Qt. @@ -1610,7 +1616,11 @@ ADNS_CONFIG= !IFDEF KFW_DIR KFW_PATH=$(KFW_DIR)\bin KFW_CFLAGS=/I$(KFW_DIR)\include +!IF "$(WIRESHARK_TARGET_PLATFORM)" == "win32" KFW_LIBS=$(KFW_DIR)\lib\krb5_32.lib +!ELSE +KFW_LIBS=$(KFW_DIR)\lib\krb5_64.lib +!ENDIF # Nmake uses carets to escape special characters KFW_CONFIG=^#define HAVE_MIT_KERBEROS 1 !else |