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 /config.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 'config.nmake')
| -rw-r--r-- | config.nmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake index a44fc39749..ab078f34ee 100644 --- a/config.nmake +++ b/config.nmake @@ -205,7 +205,7 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123 # If you don't have c-ares, comment this line out, so that C_ARES_DIR # isn't defined. # -C_ARES_DIR=$(WIRESHARK_LIBS)\c-ares-1.5.2ws +C_ARES_DIR=$(WIRESHARK_LIBS)\c-ares-1.5.3ws # # Optional: the PCRE (Perl Compatible Regular Expressions) library @@ -446,11 +446,12 @@ MSC_VER_REQUIRED=1500 # /MD use "Multithreading Debug" libraries # /D_CRT_SECURE_NO_DEPRECATE don't warn for "insecure" calls, see MSDN "Security Enhancements in the CRT" # /D_CRT_NONSTDC_NO_DEPRECATE don't warn for "Deprecated CRT Functions" as MSDN calls this +# /D_BIND_TO_CURRENT_CRT_VERSION=1 Make sure our CRT and manifest versions match (http://msdn.microsoft.com/en-us/library/cc664727.aspx) # !IF "$(MSVC_VARIANT)" == "MSVC6" || "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "DOTNET10" || "$(MSVC_VARIANT)" == "MSVC2003" || "$(MSVC_VARIANT)" == "DOTNET11" LOCAL_CFLAGS=/Zi /W3 /MD /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE" -LOCAL_CFLAGS=/Zi /W3 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) +LOCAL_CFLAGS=/Zi /W3 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) /D_BIND_TO_CURRENT_CRT_VERSION=1 !ELSE !ERROR MSVC_VARIANT unknown !ENDIF |