diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-01-06 15:45:46 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-01-06 15:45:46 +0000 |
| commit | 072370f32b3de58cd1afd436140935243d9503d2 (patch) | |
| tree | 0e26be71ac476056be3fa74909e97bc0988d810e /Makefile.nmake | |
| parent | 4ba64feed1b824e47c525c8851048e8b0b418d4f (diff) | |
Remove support for MSVC < MSVC2005; Update Developer's Guide.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40395 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 0c5a752668..467587cc78 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -493,10 +493,8 @@ clean: clean-local # It does not remove generated files that are part of the distribution. distclean-local: clean-local !IFDEF ADNS_DIR -!IF "$(MSVC_VARIANT)" != "MSVC6" rm -f $(ADNS_DLL) $(ADNS_LIBS) !ENDIF -!ENDIF !IFDEF ZLIB_DIR rm -f $(ZLIB_DLL) $(ZLIB_DIR)\zlib1.dll.manifest \ $(ZLIB_DIR)\include\zlib.h $(ZLIB_DIR)\include\zconf.h \ @@ -587,21 +585,15 @@ image:: cd .. !IFDEF ADNS_DIR -# Non-MSVC6 variants have to avoid indirectly using msvcrt.dll, +# MSVC variants supported by Wireshark have to avoid indirectly using msvcrt.dll, # therefore compile the adns dll from source ADNS_DIR package. # To avoid path problems, copy the adns sources to a temp dir, # compile and copy the resulting files back to (source) ADNS_DIR # # Unfortunately: # - we need to "patch" adns_dll.rep and adns_dll.rc (at least for MSVC2005EE) -# - on MSVC6 we can't easily rebuild, because iphlpapi.h is needed # $(ADNS_DLL): -!IF "$(MSVC_VARIANT)" == "MSVC6" - if not exist $(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns mkdir $(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns - copy $(ADNS_DIR)\adns_win32\lib\adns_dll.dll $(ADNS_DLL) - copy $(ADNS_DIR)\adns_win32\lib\adns_dll.lib $(ADNS_LIBS) -!ELSE xcopy $(ADNS_DIR) adns.tmp /D /I /E /Y copy adns_dll.dep adns.tmp\adns_win32\adns_dll copy adns_dll.rc adns.tmp\adns_win32\adns_dll @@ -618,10 +610,9 @@ $(ADNS_DLL): cd ..\..\.. rm -r -f adns.tmp !ENDIF -!ENDIF !IFDEF ZLIB_DIR -# Non-MSVC6 variants have to avoid indirectly using msvcrt.dll, +# MSVC variants supported by Wireshark have to avoid indirectly using msvcrt.dll, # therefore compile the zlib dll from source ZLIB_DIR package. # To avoid path problems, copy the zlib sources to a temp dir, # compile and copy the resulting files back to (source) ZLIB_DIR |