diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2008-04-13 14:45:43 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2008-04-13 14:45:43 +0000 |
| commit | 35681c074c97d091a5b53e3aba9134b101b773f5 (patch) | |
| tree | d15c3e4af88dd98857cf61e0fec494837afbbce5 /Makefile.nmake | |
| parent | 4322cd8eaaea59b466c217299773ee1abaf98f86 (diff) | |
first preparations to build ADNS_DLL
svn path=/trunk/; revision=24978
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index a2ce5b1011..4608de5d82 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -143,7 +143,7 @@ RESOURCES=image\wireshark.res image\libwireshark.res image\tshark.res \ LIBS_CHECK=_libs_check_ -all: $(LIBS_CHECK) config.h tools image codecs $(ZLIB_DLL) wiretap epan $(EXECUTABLES) $(RESOURCES) doc install-all +all: $(LIBS_CHECK) config.h tools image codecs $(ADNS_DLL) $(ZLIB_DLL) wiretap epan $(EXECUTABLES) $(RESOURCES) doc install-all packaging: all cd packaging @@ -479,6 +479,32 @@ image:: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. + +#!IFDEF ADNS_DIR +# Non-MSVC6 variants 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 +$(ADNS_DLL): + +# xcopy $(ADNS_DIR) adns.tmp /D /I /E /Y +# cd adns.tmp\adns_win32\adns_dll +# $(MAKE) /$(MAKEFLAGS) -f adns_dll.mak LOC="-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" +# if not exist $(ADNS_DIR) mkdir $(ADNS_DIR) +# if not exist $(ADNS_DIR)\lib mkdir $(ADNS_DIR)\lib +# if not exist $(ADNS_DIR)\include mkdir $(ADNS_DIR)\include +#!IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" +# mt.exe -nologo -manifest "adns.dll.manifest" -outputresource:adns.dll;2 +#!ENDIF +# copy adns.dll $(ADNS_DIR) +# copy adns.lib $(ADNS_DIR)\lib +# copy conf.h $(ADNS_DIR)\include +# copy adns.h $(ADNS_DIR)\include +# cd ..\..\.. +# rm -r -f adns.tmp +#!ENDIF + + !IFDEF ZLIB_DIR # Non-MSVC6 variants have to avoid indirectly using msvcrt.dll, # therefore compile the zlib dll from source ZLIB_DIR package. @@ -502,6 +528,7 @@ $(ZLIB_DLL): rm -r -f zlib.tmp !ENDIF + wiretap:: cd wiretap $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake |