summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2010-12-04 18:55:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-12-09 19:13:56 (GMT)
commitb7037b6a1f463ffe33390f26840d6cc1600dbb18 (patch)
treebb56924234257225d114ae2397b0c903d2c732c5 /Makefile
parent56fb3ddc89ab94c8b09d178a848cb553b4acf777 (diff)
downloadgit-b7037b6a1f463ffe33390f26840d6cc1600dbb18.zip
git-b7037b6a1f463ffe33390f26840d6cc1600dbb18.tar.gz
git-b7037b6a1f463ffe33390f26840d6cc1600dbb18.tar.bz2
msvc: git-daemon.exe: Fix linker "unresolved externals" error
The msvc linker complains about external symbols referenced by the new poll() emulation code. In particular, it complains about the DispatchMessage(), PeekMessage(), TranslateMessage() and MsgWaitForMultipleObjects() functions. In order to satisfy the external references, we link against the user32.lib library. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 53986b1..9d86ea2 100644
--- a/Makefile
+++ b/Makefile
@@ -1087,7 +1087,7 @@ ifeq ($(uname_S),Windows)
COMPAT_OBJS = compat/msvc.o compat/fnmatch/fnmatch.o compat/winansi.o compat/win32/pthread.o compat/win32/syslog.o compat/win32/sys/poll.o
COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/fnmatch -Icompat/regex -Icompat/fnmatch -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