diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-06-27 20:48:26 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-06-27 20:48:26 +0000 |
| commit | add36f416d9ec497a8ad95541482ca7037d5da4a (patch) | |
| tree | 179d40889f914161b8b4095f3b2b81773c40a986 /Makefile.nmake | |
| parent | 741c973afede397e2801e2f7c6e797dae7ed41b8 (diff) | |
Use the latest libsmi package. Note that we now support OID resolution
on 64-bit Windows.
svn path=/trunk/; revision=37808
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 11b3ce7dc4..262710becb 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -823,7 +823,7 @@ process_libs: !ENDIF !IFDEF SMI_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - . libsmi-0.4.8.zip + . libsmi-$(SMI_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip !ENDIF !IFDEF GEOIP_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -877,6 +877,7 @@ clean_setup: rm -r -f lua5.1.4 rm -r -f libsmi-0.4.5 rm -r -f libsmi-0.4.8 + rm -r -f libsmi-win??-svn-40773 rm -r -f nasm-2.00 rm -r -f nasm-2.02 rm -r -f nasm-2.09.08 @@ -1084,8 +1085,13 @@ install-all: install-generated-files !IFDEF SMI_DIR if not exist $(INSTALL_DIR)\snmp mkdir $(INSTALL_DIR)\snmp if not exist $(INSTALL_DIR)\snmp\mibs mkdir $(INSTALL_DIR)\snmp\mibs - xcopy "$(SMI_DIR)\lib\smi.dll" $(INSTALL_DIR) /d - xcopy "$(SMI_DIR)\mibs\*" $(INSTALL_DIR)\snmp\mibs /d + xcopy "$(SMI_DIR)\bin\libsmi-2.dll" $(INSTALL_DIR) /d + xcopy "$(SMI_DIR)\share\mibs\iana\*" $(INSTALL_DIR)\snmp\mibs /d + xcopy "$(SMI_DIR)\share\mibs\ietf\*" $(INSTALL_DIR)\snmp\mibs /d + xcopy "$(SMI_DIR)\share\mibs\irtf\*" $(INSTALL_DIR)\snmp\mibs /d + xcopy "$(SMI_DIR)\share\mibs\tubs\*" $(INSTALL_DIR)\snmp\mibs /d + xcopy "$(SMI_DIR)\share\pibs\*" $(INSTALL_DIR)\snmp\mibs /d + xcopy "$(SMI_DIR)\share\yang\*.yang" $(INSTALL_DIR)\snmp\mibs /d !ENDIF checkapi_local: |