diff options
| author | Karsten Blees <blees@dcon.de> | 2011-01-07 17:20:21 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-06 09:52:12 -0700 |
| commit | a08e803d76dff22d8c2b428a725be247425963af (patch) | |
| tree | 2523ad49591bc0ff818a66df35000e4007431b9b | |
| parent | 7e76a2f97546444fe7a2af18825450e29c3622a4 (diff) | |
| download | git-a08e803d76dff22d8c2b428a725be247425963af.tar.gz | |
MSVC: link dynamically to the CRTsk/msvc-dynlink-crt
Dynamic linking is generally preferred over static linking, and MSVCRT.dll
has been integral part of Windows for a long time.
This also fixes linker warnings for _malloc and _free in zlib.lib, which
seems to be compiled for MSVCRT.dll already.
The DLL version also exports some of the CRT initialization functions,
which are hidden in the static libcmt.lib (e.g. __wgetmainargs, required by
subsequent Unicode patches).
Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Stepan Kasal <kasal@ucw.cz>
Acked-by: Sebastian Schuberth <sschuberth@gmail.com>
Acked-by: Marat Radchenko <marat@slonopotamus.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | config.mak.uname | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config.mak.uname b/config.mak.uname index 23a8803656..4a68c24eb2 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -358,16 +358,16 @@ ifeq ($(uname_S),Windows) compat/win32/pthread.o compat/win32/syslog.o \ compat/win32/dirent.o COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\" - BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib + BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj PTHREAD_LIBS = lib = ifndef DEBUG - BASIC_CFLAGS += -GL -Os -MT + BASIC_CFLAGS += -GL -Os -MD BASIC_LDFLAGS += -LTCG AR += -LTCG else - BASIC_CFLAGS += -Zi -MTd + BASIC_CFLAGS += -Zi -MDd endif X = .exe endif |