Merge branch 'mr/msvc-link-with-invalidcontinue'
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2014 18:59:46 +0000 (11:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2014 18:59:46 +0000 (11:59 -0700)
* mr/msvc-link-with-invalidcontinue:
MSVC: link in invalidcontinue.obj for better POSIX compatibility

config.mak.uname
index 77d736c20f8afb9c894dba472f93ce4246394d71..23a880365616c34ea84d8a3194b98163864a2cd1 100644 (file)
@@ -359,7 +359,7 @@ ifeq ($(uname_S),Windows)
                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
-       EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib
+       EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj
        PTHREAD_LIBS =
        lib =
 ifndef DEBUG