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
---
 Makefile | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 2bc8075..f6401f4 100644
--- a/Makefile
+++ b/Makefile
@@ -28,9 +28,6 @@ LINK_LIBTCC =
 LIBS =
 
 ifdef CONFIG_WIN32
- ifeq ($(ARCH),x86-64)
-  CONFIG_WIN64=yes
- endif
  STRIP_BINARIES = yes
  LIBTCC = libtcc.dll
 else
@@ -93,18 +90,18 @@ ARM_FILES = $(CORE_FILES) arm-gen.c
 ARM64_FILES = $(CORE_FILES) arm64-gen.c
 C67_FILES = $(CORE_FILES) c67-gen.c tcccoff.c
 
-ifdef CONFIG_WIN64
-PROGS+=tiny_impdef$(EXESUF)
-NATIVE_FILES=$(WIN64_FILES)
-PROGS_CROSS=$(WIN32_CROSS) $(I386_CROSS) $(X64_CROSS) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)
-LIBTCC1_CROSS=lib/i386-win32/libtcc1.a
-
-else ifdef CONFIG_WIN32
-PROGS+=tiny_impdef$(EXESUF)
-NATIVE_FILES=$(WIN32_FILES)
-PROGS_CROSS=$(WIN64_CROSS) $(I386_CROSS) $(X64_CROSS) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)
-LIBTCC1_CROSS=lib/x86_64-win32/libtcc1.a
-
+ifdef CONFIG_WIN32
+ PROGS+=tiny_impdef$(EXESUF) tiny_libmaker$(EXESUF)
+ifeq ($(ARCH),x86-64)
+ NATIVE_FILES=$(WIN64_FILES)
+ PROGS_CROSS=$(WIN32_CROSS)
+ LIBTCC1_CROSS=lib/i386-win32/libtcc1.a
+else
+ NATIVE_FILES=$(WIN32_FILES)
+ PROGS_CROSS=$(WIN64_CROSS)
+ LIBTCC1_CROSS=lib/x86_64-win32/libtcc1.a
+endif
+ PROGS_CROSS+=$(X64_CROSS) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)
 else ifeq ($(ARCH),i386)
 NATIVE_FILES=$(I386_FILES)
 PROGS_CROSS=$(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)
-- 
cgit v1.3.1