From a68c05ed7719689a8f699b82291a9d14fea1cfec Mon Sep 17 00:00:00 2001 From: Renaud Fivet Date: Wed, 11 Feb 2015 15:19:11 +0800 Subject: [PATCH] When detecting target platform, remove Windows variable part to reduce to CYGWIN and MINGW32. --- Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index c2e184a..009611c 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,9 @@ endif export E Q uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') +# for windows based target, insure we strip the variant part +# CYGWIN_NT-6.1, CYGWIN_NT-6.1-WOW, CYGWIN_NT-6.1-WOW64, MINGW32_NT-6.1 +uname_S := $(shell sh -c 'echo $(uname_S) | sed s/_.*$$//') PROGRAM=ue @@ -39,15 +42,11 @@ endif ifeq ($(uname_S),Darwin) DEFINES=-DAUTOCONF -DPOSIX -DSYSV -D_DARWIN_C_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_XOPEN_SOURCE=600 endif -ifeq ($(uname_S),CYGWIN_NT-6.1-WOW64) +ifeq ($(uname_S),CYGWIN) DEFINES=-DAUTOCONF -DPROGRAM=$(PROGRAM) LIBS=-lcurses # SYSV endif -ifeq ($(uname_S),CYGWIN_NT-6.1) - DEFINES=-DAUTOCONF -DPROGRAM=$(PROGRAM) - LIBS=-lcurses # SYSV -endif -ifeq ($(uname_S),MINGW32_NT-6.1) +ifeq ($(uname_S),MINGW32) DEFINES=-DAUTOCONF -DSYSV -DMINGW32 -DPROGRAM=$(PROGRAM) LIBS= endif