diff options
| author |  Johannes Sixt <j6t@kdbg.org> | 2009-10-22 20:26:29 +0200 |
|---|---|---|
| committer | Johannes Sixt <j6t@kdbg.org> | 2009-10-23 12:48:31 +0200 |
| commit | 9bccfcdbff3b11e11a69d05c50c8bc1a9a6dbb5f (patch) | |
| tree | a25fa960343d3aed4546021a4d830c1bfc5caece /Makefile | |
| parent | MSVC: Enable OpenSSL, and translate -lcrypto (diff) | |
| download | tgif-9bccfcdbff3b11e11a69d05c50c8bc1a9a6dbb5f.tar.xz | |
Windows: use BLK_SHA1 again
Since NO_OPENSSL is no longer defined on Windows, BLK_SHA1 is not defined
anymore implicitly. Define it explicitly.
As a nice side-effect, we no longer link against libcrypto.dll, which has
non-trivial startup costs because it depends on 6 otherwise unneeded
DLLs.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -911,6 +911,7 @@ ifdef MSVC NO_REGEX = YesPlease NO_CURL = YesPlease NO_PTHREADS = YesPlease + BLK_SHA1 = YesPlease CC = compat/vcbuild/scripts/clink.pl AR = compat/vcbuild/scripts/lib.pl @@ -960,6 +961,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) UNRELIABLE_FSTAT = UnfortunatelyYes OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo NO_REGEX = YesPlease + BLK_SHA1 = YesPlease COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/fnmatch COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\" COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/winansi.o |