Merge branch 'sk/msvc-dynlink-crt'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:46 +0000 (12:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:46 +0000 (12:06 -0700)
* sk/msvc-dynlink-crt:
MSVC: link dynamically to the CRT

1  2 
config.mak.uname
index f2a4d6353c01112152c7a378c4eb3d84c6634f5e,4a68c24eb2ad27bae3ae43115f0e52b04d948a4f..1ae675b05344912d8798b9856b60b03c282cf908
@@@ -362,8 -357,8 +362,8 @@@ ifeq ($(uname_S),Windows
        COMPAT_OBJS = compat/msvc.o compat/winansi.o \
                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\"
 +      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 =