From 54fc439e9ec22f15986cb31b229de10dec420398 Mon Sep 17 00:00:00 2001 From: seyko Date: Wed, 4 Mar 2015 11:19:39 +0300 Subject: an unification of the tcc cross names for a windows produce a i386-win-mingw32-tcc i386-win-tcc x86_64-win-mingw32-tcc x86_64-win-tcc arm-win-mingw32ce-tcc arm-win-tcc instead of the i386-w64-mingw32-tcc i386-win32-tcc x86_64-w64-mingw32-tcc x86_64-win32-tcc arm-wince-mingw32ce-tcc arm-win32-tcc Replacing a *-win32 directory names with a *-win names because this names are based on the names of the tcc x86_64-win32-tcc, i386-win32-tcc --- lib/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/Makefile b/lib/Makefile index 1832dd3..bb70dea 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -8,10 +8,10 @@ VPATH = $(top_srcdir)/lib $(top_srcdir)/win32/lib ifndef TARGET # native library ifdef CONFIG_WIN64 - TARGET = x86_64-win32 + TARGET = x86_64-win else ifdef CONFIG_WIN32 - TARGET = i386-win32 + TARGET = i386-win else ifeq ($(ARCH),i386) TARGET = i386 @@ -57,14 +57,14 @@ PICFLAGS = -fPIC # correctly CFLAGS := $(filter-out -fstack-protector-strong,$(CFLAGS)) -ifeq "$(TARGET)" "i386-win32" +ifeq "$(TARGET)" "i386-win" OBJ = $(addprefix $(DIR)/,$(WIN32_O)) TGT = -DTCC_TARGET_I386 -DTCC_TARGET_PE XCC = $(TCC) -B$(top_srcdir)/win32 -I$(top_srcdir)/include XAR = $(DIR)/tiny_libmaker$(EXESUF) PICFLAGS = else -ifeq "$(TARGET)" "x86_64-win32" +ifeq "$(TARGET)" "x86_64-win" OBJ = $(addprefix $(DIR)/,$(WIN64_O)) TGT = -DTCC_TARGET_X86_64 -DTCC_TARGET_PE XCC = $(TCC) -B$(top_srcdir)/win32 -I$(top_srcdir)/include @@ -126,4 +126,4 @@ $(DIR)/exists : @echo $@ > $@ clean : - rm -rfv i386-win32 x86_64-win32 i386 x86_64 + rm -rfv i386-win x86_64-win i386 x86_64 -- cgit v1.3.1