aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-10-09 10:24:14 -0700
committerShawn O. Pearce <spearce@spearce.org>2008-10-09 10:24:14 -0700
commited187bd5936267744aa579ab1a33f0b07862a74b (patch)
tree69d7bcb71557ef35d8fc9300d8d0cf986133cd1e /Makefile
parent78a935d48b28ebf5b1af348d7e57763f2955afd1 (diff)
parentadbc0b6b6e57c11ca49779d01f549260a920a97d (diff)
downloadgit-ed187bd5936267744aa579ab1a33f0b07862a74b.tar.gz
git-ed187bd5936267744aa579ab1a33f0b07862a74b.tar.xz
Merge branch 'dp/cywginstat'
* dp/cywginstat: cygwin: Use native Win32 API for stat mingw: move common functionality to win32.h add have_git_dir() function
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index dd31e339f..308dc70b5 100644
--- a/Makefile
+++ b/Makefile
@@ -346,6 +346,7 @@ LIB_H += cache.h
LIB_H += cache-tree.h
LIB_H += commit.h
LIB_H += compat/mingw.h
+LIB_H += compat/cygwin.h
LIB_H += csum-file.h
LIB_H += decorate.h
LIB_H += delta.h
@@ -748,6 +749,9 @@ ifeq ($(uname_S),HP-UX)
NO_SYS_SELECT_H = YesPlease
SNPRINTF_RETURNS_BOGUS = YesPlease
endif
+ifneq (,$(findstring CYGWIN,$(uname_S)))
+ COMPAT_OBJS += compat/cygwin.o
+endif
ifneq (,$(findstring MINGW,$(uname_S)))
NO_MMAP = YesPlease
NO_PREAD = YesPlease