aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorgrischka <grischka>2016-10-02 01:39:07 +0200
committergrischka <grischka>2016-10-02 01:39:07 +0200
commitf350487e1e5d4606c8b1508f920b7325c3c50bc1 (patch)
tree978b07fddd3d8d8791a036b3ea470e5ffe46b5ff /lib
parent49d3118621a68f6583228f123efd16f0f803d908 (diff)
downloadtinycc-f350487e1e5d4606c8b1508f920b7325c3c50bc1.tar.gz
tinycc-f350487e1e5d4606c8b1508f920b7325c3c50bc1.tar.bz2
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
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile11
1 files changed, 6 insertions, 5 deletions
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