diff options
| author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2009-11-07 20:08:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-09 01:59:11 (GMT) |
| commit | d691d84eedc0f02b4caebbee89149fff18e1db91 (patch) | |
| tree | 0c8ac4473f28d1150b3fcc5a15bbde51bf0abde9 /Makefile | |
| parent | 035b76b03f63e077e3465a99bee5dffa29822344 (diff) | |
| download | git-d691d84eedc0f02b4caebbee89149fff18e1db91.zip git-d691d84eedc0f02b4caebbee89149fff18e1db91.tar.gz git-d691d84eedc0f02b4caebbee89149fff18e1db91.tar.bz2 | |
Makefile: keep MSVC and Cygwin configuration separate
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -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') +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 @@ -893,7 +899,7 @@ ifeq ($(uname_S),HP-UX) NO_SYS_SELECT_H = YesPlease SNPRINTF_RETURNS_BOGUS = YesPlease endif -ifdef MSVC +ifeq ($(uname_S),Windows) GIT_VERSION := $(GIT_VERSION).MSVC pathsep = ; NO_PREAD = YesPlease @@ -945,7 +951,7 @@ else BASIC_CFLAGS += -Zi -MTd endif X = .exe -else +endif ifneq (,$(findstring MINGW,$(uname_S))) pathsep = ; NO_PREAD = YesPlease @@ -994,7 +1000,6 @@ else NO_PTHREADS = YesPlease endif endif -endif -include config.mak.autogen -include config.mak |