Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Makefile: keep MSVC and Cygwin configuration separate
author
Ramsay Jones
<ramsay@ramsay1.demon.co.uk>
Sat, 7 Nov 2009 20:08:01 +0000
(20:08 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 9 Nov 2009 01:59:11 +0000
(17:59 -0800)
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Makefile
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
035b76b
)
diff --git
a/Makefile
b/Makefile
index 8e1cfc556fc164ac48c4788aa2d86997a97c4c78..306ca8611c93e83727f25a9a2182d9b2973079ae 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-212,6
+212,12
@@
uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')
uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')
+ifdef MSVC
+ # avoid the MingW and Cygwin configuration sections
+ uname_S := Windows
+ uname_O := Windows
+endif
+
# CFLAGS and LDFLAGS are for the users to override from the command line.
CFLAGS = -g -O2 -Wall
# CFLAGS and LDFLAGS are for the users to override from the command line.
CFLAGS = -g -O2 -Wall
@@
-893,7
+899,7
@@
ifeq ($(uname_S),HP-UX)
NO_SYS_SELECT_H = YesPlease
SNPRINTF_RETURNS_BOGUS = YesPlease
endif
NO_SYS_SELECT_H = YesPlease
SNPRINTF_RETURNS_BOGUS = YesPlease
endif
-if
def MSVC
+if
eq ($(uname_S),Windows)
GIT_VERSION := $(GIT_VERSION).MSVC
pathsep = ;
NO_PREAD = YesPlease
GIT_VERSION := $(GIT_VERSION).MSVC
pathsep = ;
NO_PREAD = YesPlease
@@
-945,7
+951,7
@@
else
BASIC_CFLAGS += -Zi -MTd
endif
X = .exe
BASIC_CFLAGS += -Zi -MTd
endif
X = .exe
-e
lse
+e
ndif
ifneq (,$(findstring MINGW,$(uname_S)))
pathsep = ;
NO_PREAD = YesPlease
ifneq (,$(findstring MINGW,$(uname_S)))
pathsep = ;
NO_PREAD = YesPlease
@@
-994,7
+1000,6
@@
else
NO_PTHREADS = YesPlease
endif
endif
NO_PTHREADS = YesPlease
endif
endif
-endif
-include config.mak.autogen
-include config.mak
-include config.mak.autogen
-include config.mak