diff options
| author | Gerald Combs <gerald@wireshark.org> | 2008-09-16 21:08:18 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2008-09-16 21:08:18 +0000 |
| commit | ba485a4163b226be0572cd3b5ed312c9c47e4368 (patch) | |
| tree | 01b34772995fbc2a9326a238bfd50bb195063656 /Makefile.nmake | |
| parent | 98fd7b71dfc0b8e34862c57b77c30168907520d4 (diff) | |
Add /D_BIND_TO_CURRENT_CRT_VERSION=1 to LOCAL_CFLAGS in modern versions
of Visual C++. (How did this "feature" ever see the light of day?) Make
sure we use LOCAL_CFLAGS *everywhere*. This should fix problems with
building a usable installer under Visual Studio 2008 SP1.
Add comments with links to Visual C++'s idiotic handling of assemblies
and deployment using xcopy. Move to c-ares 1.5.3. Make sure we remove
all of our manifests in epan and packaging/u3/tools.
svn path=/trunk/; revision=26219
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index d3ddf2c8c2..8ccd49f9c1 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -3,6 +3,9 @@ # # $Id$ +# We "Deploy using XCopy," which is described at +# http://msdn.microsoft.com/en-us/library/ms235291.aspx + include config.nmake include <win32.mak> @@ -551,7 +554,7 @@ $(ADNS_DLL): copy adns_dll.rc adns.tmp\adns_win32\adns_dll cd adns.tmp\adns_win32\adns_dll set CFG=adns_dll - Win32 Release - $(MAKE) /$(MAKEFLAGS) -f adns_dll.mak LOC="-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" + $(MAKE) /$(MAKEFLAGS) -f adns_dll.mak LOC="$(LOCAL_CFLAGS)" cd ..\lib !IF $(MSC_VER_REQUIRED) >= 1400 mt.exe -nologo -manifest "adns_dll.dll.manifest" -outputresource:adns_dll.dll;2 @@ -572,7 +575,7 @@ $(ADNS_DLL): $(ZLIB_DLL): xcopy $(ZLIB_DIR) zlib.tmp /D /I /E /Y cd zlib.tmp - $(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll LOC="-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" + $(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll LOC="$(LOCAL_CFLAGS)" if not exist $(ZLIB_DIR) mkdir $(ZLIB_DIR) if not exist $(ZLIB_DIR)\lib mkdir $(ZLIB_DIR)\lib if not exist $(ZLIB_DIR)\include mkdir $(ZLIB_DIR)\include @@ -584,7 +587,7 @@ $(ZLIB_DLL): copy zconf.h $(ZLIB_DIR)\include copy zlib.h $(ZLIB_DIR)\include cd .. - rm -r -f zlib.tmp + rm -r -f zlib.tmp !ENDIF wsutil:: @@ -733,7 +736,7 @@ process_libs: !ENDIF !IFDEF C_ARES_DIR @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - . c-ares-1.5.2ws.zip + . c-ares-1.5.3ws.zip !ENDIF !IFDEF ADNS_DIR @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -842,7 +845,7 @@ process_libs: # UPDATING REMOVES THE FORMER USER DIRS clean_setup: rm -r -f $(WIRESHARK_LIBS)/adns-1.0-win32-05ws - rm -r -f $(WIRESHARK_LIBS)/c-ares-1.5.2ws + rm -r -f $(WIRESHARK_LIBS)/c-ares-1.5.3ws rm -r -f $(WIRESHARK_LIBS)/gettext-0.14.5 rm -r -f $(WIRESHARK_LIBS)/gettext-runtime-0.17 rm -r -f $(WIRESHARK_LIBS)/gettext-runtime-0.17-1 |