Skip to content

Commit 00305f0

Browse files
authored
Merge pull request #1957 from dscho/fix-msvc-build
Fix MSVC/Visual Studio build
2 parents f9be97d + 11e388b commit 00305f0

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

config.mak.uname

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ ifeq ($(uname_S),Windows)
426426
compat/win32/pthread.o compat/win32/syslog.o \
427427
compat/win32/dirent.o compat/win32/fscache.o
428428
COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DDETECT_MSYS_TTY -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
429-
BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE
429+
BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -ENTRY:wmainCRTStartup -SUBSYSTEM:CONSOLE
430430
# invalidcontinue.obj allows Git's source code to close the same file
431431
# handle twice, or to access the osfhandle of an already-closed stdout
432432
# See https://msdn.microsoft.com/en-us/library/ms235330.aspx

contrib/buildsystems/Generators/Vcxproj.pm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ sub createProject {
172172
<AdditionalLibraryDirectories>\$(VCPKGLibDirectory);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
173173
<AdditionalDependencies>\$(VCPKGLibs);\$(AdditionalDependencies)</AdditionalDependencies>
174174
<AdditionalOptions>invalidcontinue.obj %(AdditionalOptions)</AdditionalOptions>
175+
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
175176
<ManifestFile>$cdup\\compat\\win32\\git.manifest</ManifestFile>
176177
<SubSystem>Console</SubSystem>
177178
</Link>

0 commit comments

Comments
 (0)