as we can't easily (re)build adns on msvc6, create and use compiler specific dirs...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25000 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.nmake b/Makefile.nmake
index dfa8d75dcc8ea3372ab7fb9e9b09e4c3c12746b6..b8b996ed58655a7253b58c6007b9aaae98653d58 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -404,7 +404,7 @@ clean: clean-local
 distclean-local: clean-local
 !IFDEF ADNS_DIR
 !IF "$(MSVC_VARIANT)" != "MSVC6"
-       rm -f $(ADNS_DLL) $(ADNS_DIR)\adns_win32\lib\adns_dll.lib
+       rm -f $(ADNS_DLL) $(ADNS_LIBS)
 !ENDIF
 !ENDIF
 !IFDEF ZLIB_DIR
@@ -495,7 +495,11 @@ image::
 # - on MSVC6 we can't easily rebuild, because iphlpapi.h is needed
 # 
 $(ADNS_DLL):
-!IF "$(MSVC_VARIANT)" != "MSVC6"
+!IF "$(MSVC_VARIANT)" == "MSVC6"
+       if not exist $(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns mkdir $(WIRESHARK_LIBS)\$(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
@@ -504,9 +508,9 @@ $(ADNS_DLL):
        $(MAKE) /$(MAKEFLAGS) -f adns_dll.mak LOC="-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE"
 !IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20"
        cd ..\lib
-       pwd
        mt.exe -nologo -manifest "adns_dll.dll.manifest" -outputresource:adns_dll.dll;2
 !ENDIF
+       if not exist $(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns mkdir $(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns
        copy adns_dll.dll $(ADNS_DLL)
        copy adns_dll.lib $(ADNS_LIBS)
        cd ..\..\..

diff --git a/config.nmake b/config.nmake
index 831681f8577d04971dce4436d506ca77e8736618..afb1951106cab750118c2cbffae5a21c40c53dec 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -701,8 +701,8 @@ ZLIB_CONFIG=
 !IFDEF ADNS_DIR
 ADNS_PATH=$(ADNS_DIR)\adns_win32\lib
 ADNS_CFLAGS=/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32
-ADNS_LIBS=$(ADNS_DIR)\adns_win32\lib\adns_dll.lib
-ADNS_DLL=$(ADNS_DIR)\adns_win32\lib\adns_dll.dll
+ADNS_LIBS=$(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns\adns_dll.lib
+ADNS_DLL=$(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns\adns_dll.dll
 # Nmake uses carets to escape special characters
 ADNS_CONFIG=^#define HAVE_GNU_ADNS 1
 !else