summaryrefslogtreecommitdiff
path: root/config.nmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2011-06-27 20:48:26 +0000
committerGerald Combs <gerald@wireshark.org>2011-06-27 20:48:26 +0000
commitadd36f416d9ec497a8ad95541482ca7037d5da4a (patch)
tree179d40889f914161b8b4095f3b2b81773c40a986 /config.nmake
parent741c973afede397e2801e2f7c6e797dae7ed41b8 (diff)
downloadwireshark-add36f416d9ec497a8ad95541482ca7037d5da4a.tar.gz
Use the latest libsmi package. Note that we now support OID resolution
on 64-bit Windows. svn path=/trunk/; revision=37808
Diffstat (limited to 'config.nmake')
-rw-r--r--config.nmake10
1 files changed, 6 insertions, 4 deletions
diff --git a/config.nmake b/config.nmake
index 69c6914ed6..3c689c8496 100644
--- a/config.nmake
+++ b/config.nmake
@@ -394,7 +394,7 @@ AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap_Devpack_4_1_0_1622\AirPcap_Devpack
#
# Used for oid-name resolution for SNMP and other protocols
#
-SMI_DIR=$(WIRESHARK_LIBS)\libsmi-0.4.8
+SMI_PKG=svn-40773
#
# Optional: GeoIP, IP address database lookups
@@ -589,7 +589,7 @@ AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap_Devpack_4_1_0_1622\AirPcap_Devpack
#
# Used for oid-name resolution for SNMP and other protocols
#
-#SMI_DIR=$(WIRESHARK_LIBS)\libsmi-0.4.8
+SMI_PKG=svn-40773
#
# Optional: GeoIP, IP address database lookups
@@ -1250,11 +1250,13 @@ HHC_CFLAGS=
HHC_LIBS=
!ENDIF
-!IFDEF SMI_DIR
+!IFDEF SMI_PKG
+SMI_DIR=$(WIRESHARK_LIBS)\libsmi-$(SMI_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
SMI_CONFIG=^#define HAVE_LIBSMI 1
SMI_CFLAGS=/I$(SMI_DIR)\include
-SMI_LIBS=$(SMI_DIR)\lib\smi.lib
+SMI_LIBS=$(SMI_DIR)\lib\libsmi-2.lib
!ELSE
+SMI_DIR=
SMI_LIBS=
SMI_CFLAGS=
SMI_CONFIG=