Signed-off-by: Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxx> --- Makefile | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 8e1cfc5..12c8249 100644 --- a/Makefile +++ b/Makefile @@ -658,6 +658,14 @@ EXTLIBS = # Platform specific tweaks # +ifdef MSVC + # When building with msvc, on MinGW or Cygwin, we + # override the uname settings to make it easier to + # keep the configuration sections separate + uname_S = Windows + uname_O = Windows +endif + # We choose to avoid "if .. else if .. else .. endif endif" # because maintaining the nesting to match is a pain. If # we had "elif" things would have been much nicer... @@ -893,7 +901,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 +953,7 @@ else BASIC_CFLAGS += -Zi -MTd endif X = .exe -else +endif ifneq (,$(findstring MINGW,$(uname_S))) pathsep = ; NO_PREAD = YesPlease @@ -994,7 +1002,6 @@ else NO_PTHREADS = YesPlease endif endif -endif -include config.mak.autogen -include config.mak -- 1.6.5 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html