summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-16 20:55:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-12-16 20:55:36 (GMT)
commitb5c6aac01baf9164e08915b348490710e83119f9 (patch)
tree4099aab13b34925e45a6b57bb0af30288a22739e /Makefile
parent620b89cd98219db33ce499c7f8e50d091fe9b598 (diff)
parent93d85f57be00859f8adecd474da30a7279cd4ec2 (diff)
downloadgit-b5c6aac01baf9164e08915b348490710e83119f9.zip
git-b5c6aac01baf9164e08915b348490710e83119f9.tar.gz
git-b5c6aac01baf9164e08915b348490710e83119f9.tar.bz2
Merge branch 'rj/msvc-fix'
* rj/msvc-fix: msvc: Fix macro redefinition warnings msvc: Fix build by adding missing INTMAX_MAX define msvc: git-daemon.exe: Fix linker "unresolved externals" error msvc: Fix compilation errors in compat/win32/sys/poll.c
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8cf7da9..57d9c65 100644
--- a/Makefile
+++ b/Makefile
@@ -1102,7 +1102,7 @@ ifeq ($(uname_S),Windows)
compat/win32/sys/poll.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\"
BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib
- EXTLIBS = advapi32.lib shell32.lib wininet.lib ws2_32.lib
+ EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib
PTHREAD_LIBS =
lib =
ifndef DEBUG