Windows: Remove dependency on pthreadGC2.dll
Commit 44626dc7 (MSVC: Windows-native implementation for subset of threads API, 2010-01-15) introduces builtin replacement of pthreadGC2.dll functionality, thus we can completely drop dependency on this dll. Signed-off-by: Michael Lukashov <michael.lukashov@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Lukashov committed
Jan 24, 2010 at 10:10 UTC
767f8b31cb3becbe303eb50a3faf3b4753fbaddd
1 file changed
+3
-1
Makefile
+3
-1
@@ -994,6 +994,7 @@ ifeq ($(uname_S),Windows)
994
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\"
995
BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib
996
EXTLIBS = advapi32.lib shell32.lib wininet.lib ws2_32.lib
997
+ PTHREAD_LIBS =
998
lib =
999
ifndef DEBUG
1000
BASIC_CFLAGS += -GL -Os -MT
@@ -1036,11 +1037,12 @@ ifneq (,$(findstring MINGW,$(uname_S)))
1037
NO_PYTHON = YesPlease
1038
BLK_SHA1 = YesPlease
1039
THREADED_DELTA_SEARCH = YesPlease
1039
- COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/fnmatch
1040
+ COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/fnmatch -Icompat/win32
1041
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
1042
COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/winansi.o \
1043
compat/win32/pthread.o
1044
EXTLIBS += -lws2_32
1045
+ PTHREAD_LIBS =
1046
X = .exe
1047
ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
1048
htmldir=doc/git/html/