diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-03 12:06:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-03 12:06:46 -0700 |
| commit | 14ce98d7e9f4cb84bc7edd41bd29abf0fa901490 (patch) | |
| tree | 64bd25c119cf3e94f2cb4c14433798c55ec7b1e5 /config.mak.uname | |
| parent | a3c0efec9b35a7db41537cc9f80e3ebb7ce2fbfe (diff) | |
| parent | a08e803d76dff22d8c2b428a725be247425963af (diff) | |
| download | git-14ce98d7e9f4cb84bc7edd41bd29abf0fa901490.tar.gz | |
Merge branch 'sk/msvc-dynlink-crt'
* sk/msvc-dynlink-crt:
MSVC: link dynamically to the CRT
Diffstat (limited to 'config.mak.uname')
| -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 f2a4d6353c..1ae675b053 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -363,16 +363,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 -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 |