From: Ramsay Jones Date: Sat, 4 Dec 2010 18:55:51 +0000 (+0000) Subject: msvc: git-daemon.exe: Fix linker "unresolved externals" error X-Git-Tag: v1.7.4-rc0~32^2~2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b7037b6a1f463ffe33390f26840d6cc1600dbb18;p=git.git 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 Acked-by: Erik Faye-Lund Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index 53986b1ec..9d86ea2d3 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