From f350487e1e5d4606c8b1508f920b7325c3c50bc1 Mon Sep 17 00:00:00 2001
From: grischka <grischka>
Date: Sun, 2 Oct 2016 01:39:07 +0200
Subject: win32/64: msys2 support

Support ./configure && make under msys2 (a new msys fork)
on win32 and win64.

Get rid of CONFIG_WIN64 make-var. (On windows, WIN32 in
general is used for both 32 and 64 bit platforms)

Also:
- cleanup win32/build-tcc.bat
- adjust win32/(doc/)tcc-win32.tx
---
 lib/Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/Makefile b/lib/Makefile
index da678ef..9b4a884 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -8,11 +8,12 @@ VPATH = $(TOPSRC)/lib $(TOPSRC)/win32/lib
 
 ifndef TARGET
  # we're building the native libtcc1.a
- ifdef CONFIG_WIN64
-  TARGET = x86_64-win32
-  # using tcc
- else ifdef CONFIG_WIN32
-  TARGET = i386-win32
+ ifdef CONFIG_WIN32
+  ifeq ($(ARCH),x86-64)
+   TARGET = x86_64-win32
+  else
+   TARGET = i386-win32
+  endif
   # using tcc
  else ifeq ($(ARCH),i386)
   TARGET = i386
-- 
cgit v1.3.1