summaryrefslogtreecommitdiff
path: root/makefile
diff options
context:
space:
mode:
authorruki <[email protected]>2020-02-11 23:06:04 +0800
committerruki <[email protected]>2020-02-11 12:36:24 +0800
commit94c19e101325c6a6a63a281ae6f6fee1ed230298 (patch)
tree8563d7d0184cba06f2ab233eccf43ed7428ab1f5 /makefile
parenta0ff9f3cf3e5a425e8f7b4313e8b42a08effda42 (diff)
add msys and cygwin makefile
Diffstat (limited to 'makefile')
-rw-r--r--makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/makefile b/makefile
index f0859a93c..be77ef868 100644
--- a/makefile
+++ b/makefile
@@ -26,7 +26,7 @@ endif
PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i linux},linux,))
PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i darwin},macosx,))
PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i cygwin},cygwin,))
-PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i mingw},mingw,))
+PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i mingw},msys,))
PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i windows},windows,))
PLAT :=$(if $(PLAT),$(PLAT),linux)
@@ -34,7 +34,7 @@ PLAT :=$(if $(PLAT),$(PLAT),linux)
ifeq ($(ARCH),)
ARCH :=$(if $(findstring windows,$(PLAT)),x86,$(ARCH))
-ARCH :=$(if $(findstring mingw,$(PLAT)),i386,$(ARCH))
+ARCH :=$(if $(findstring msys,$(PLAT)),x$(shell getconf LONG_BIT),$(ARCH))
ARCH :=$(if $(findstring macosx,$(PLAT)),x$(shell getconf LONG_BIT),$(ARCH))
ARCH :=$(if $(findstring linux,$(PLAT)),x$(shell getconf LONG_BIT),$(ARCH))
ARCH :=$(if $(findstring x32,$(ARCH)),i386,$(ARCH))