aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2008-09-16 21:08:18 +0000
committerGerald Combs <gerald@wireshark.org>2008-09-16 21:08:18 +0000
commitba485a4163b226be0572cd3b5ed312c9c47e4368 (patch)
tree01b34772995fbc2a9326a238bfd50bb195063656 /packaging
parent98fd7b71dfc0b8e34862c57b77c30168907520d4 (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 'packaging')
-rw-r--r--packaging/u3/tools/makefile.nmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/u3/tools/makefile.nmake b/packaging/u3/tools/makefile.nmake
index 241daf8a63..babf72bee0 100644
--- a/packaging/u3/tools/makefile.nmake
+++ b/packaging/u3/tools/makefile.nmake
@@ -29,7 +29,7 @@ libgcrypt-11.dll libgpg-error-0.dll: $(GNUTLS_DIR)\bin\$@
$(COPY) $(GNUTLS_DIR)\bin\$@ $@
clean:
- rm -rf utest.exe *.obj
+ rm -rf utest.exe *.obj *.manifest
rm -rf libgcrypt-11.dll libgpg-error-0.dll
rm -rf state nodeid
rm -rf *~ *.*~