From d4a9162d4adc045e318e7a27ced019c36b9803f9 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 27 Nov 2018 22:50:03 +0100 Subject: [PATCH 1/2] squash! mingw: replace mingw_startup() hack after adjusting the MSVC linker flags to force it to use wmain(). Noticed by Ben Peart. Signed-off-by: Johannes Schindelin --- config.mak.uname | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.mak.uname b/config.mak.uname index c820bc90458b8e..5ab782f8110fa7 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -426,7 +426,7 @@ ifeq ($(uname_S),Windows) compat/win32/pthread.o compat/win32/syslog.o \ compat/win32/dirent.o compat/win32/fscache.o COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DDETECT_MSYS_TTY -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\" - BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE + BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -ENTRY:wmainCRTStartup -SUBSYSTEM:CONSOLE # invalidcontinue.obj allows Git's source code to close the same file # handle twice, or to access the osfhandle of an already-closed stdout # See https://msdn.microsoft.com/en-us/library/ms235330.aspx From 11e388bf808525273a20a52c0d3661b5fe2112e0 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 27 Nov 2018 23:04:00 +0100 Subject: [PATCH 2/2] fixup! contrib/buildsystems: add a backend for modern Visual Studio versions Signed-off-by: Johannes Schindelin --- contrib/buildsystems/Generators/Vcxproj.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm index 2a8277eb9343ff..00ef26fddd7c96 100644 --- a/contrib/buildsystems/Generators/Vcxproj.pm +++ b/contrib/buildsystems/Generators/Vcxproj.pm @@ -172,6 +172,7 @@ sub createProject { \$(VCPKGLibDirectory);%(AdditionalLibraryDirectories) \$(VCPKGLibs);\$(AdditionalDependencies) invalidcontinue.obj %(AdditionalOptions) + wmainCRTStartup $cdup\\compat\\win32\\git.manifest Console