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
Unified · Split
| @@ -77,9 +77,9 @@ ifeq ($(TOP),.) · 76 unmodified lines | |||
| 77 | 77 | ||
| 78 | PROGS=tcc$(EXESUF) | 78 | PROGS=tcc$(EXESUF) |
| 79 | I386_CROSS = i386-linux-gnu-tcc$(EXESUF) | 79 | I386_CROSS = i386-linux-gnu-tcc$(EXESUF) |
| 80 | WIN32_CROSS = i386-w64-mingw32-tcc$(EXESUF) | 80 | WIN32_CROSS = i386-win-mingw32-tcc$(EXESUF) |
| 81 | WIN64_CROSS = x86_64-w64-mingw32-tcc$(EXESUF) | 81 | WIN64_CROSS = x86_64-win-mingw32-tcc$(EXESUF) |
| 82 | WINCE_CROSS = arm-wince-mingw32ce-tcc$(EXESUF) | 82 | WINCE_CROSS = arm-win-mingw32ce-tcc$(EXESUF) |
| 83 | X64_CROSS = x86_64-linux-gnu-tcc$(EXESUF) | 83 | X64_CROSS = x86_64-linux-gnu-tcc$(EXESUF) |
| 84 | ARM_FPA_CROSS = arm-linux-fpa-tcc$(EXESUF) | 84 | ARM_FPA_CROSS = arm-linux-fpa-tcc$(EXESUF) |
| 85 | ARM_FPA_LD_CROSS = arm-linux-fpa-ld-tcc$(EXESUF) | 85 | ARM_FPA_LD_CROSS = arm-linux-fpa-ld-tcc$(EXESUF) |
| @@ -92,9 +92,9 @@ C67_CROSS = c67-tcc$(EXESUF) · 6 unmodified lines | |||
| 92 | 92 | ||
| 93 | # Legacy symlinks for cross compilers | 93 | # Legacy symlinks for cross compilers |
| 94 | $(I386_CROSS)_LINK = i386-tcc$(EXESUF) | 94 | $(I386_CROSS)_LINK = i386-tcc$(EXESUF) |
| 95 | $(WIN32_CROSS)_LINK = i386-win32-tcc$(EXESUF) | 95 | $(WIN32_CROSS)_LINK = i386-win-tcc$(EXESUF) |
| 96 | $(WIN64_CROSS)_LINK = x86_64-win32-tcc$(EXESUF) | 96 | $(WIN64_CROSS)_LINK = x86_64-win-tcc$(EXESUF) |
| 97 | $(WINCE_CROSS)_LINK = arm-win32-tcc$(EXESUF) | 97 | $(WINCE_CROSS)_LINK = arm-win-tcc$(EXESUF) |
| 98 | $(X64_CROSS)_LINK = x86_64-tcc$(EXESUF) | 98 | $(X64_CROSS)_LINK = x86_64-tcc$(EXESUF) |
| 99 | $(ARM_FPA_CROSS)_LINK = arm-fpa-tcc$(EXESUF) | 99 | $(ARM_FPA_CROSS)_LINK = arm-fpa-tcc$(EXESUF) |
| 100 | $(ARM_FPA_LD_CROSS)_LINK = arm-fpa-ld-tcc$(EXESUF) | 100 | $(ARM_FPA_LD_CROSS)_LINK = arm-fpa-ld-tcc$(EXESUF) |
| @@ -116,34 +116,34 @@ ifdef CONFIG_WIN64 · 15 unmodified lines | |||
| 116 | PROGS+=tiny_impdef$(EXESUF) tiny_libmaker$(EXESUF) | 116 | PROGS+=tiny_impdef$(EXESUF) tiny_libmaker$(EXESUF) |
| 117 | NATIVE_FILES=$(WIN64_FILES) | 117 | NATIVE_FILES=$(WIN64_FILES) |
| 118 | PROGS_CROSS=$(WIN32_CROSS) $(I386_CROSS) $(X64_CROSS) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS) | 118 | PROGS_CROSS=$(WIN32_CROSS) $(I386_CROSS) $(X64_CROSS) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS) |
| 119 | LIBTCC1_CROSS=lib/i386-win32/libtcc1.a | 119 | LIBTCC1_CROSS=lib/i386-win/libtcc1.a |
| 120 | LIBTCC1=libtcc1.a | 120 | LIBTCC1=libtcc1.a |
| 121 | else ifdef CONFIG_WIN32 | 121 | else ifdef CONFIG_WIN32 |
| 122 | PROGS+=tiny_impdef$(EXESUF) tiny_libmaker$(EXESUF) | 122 | PROGS+=tiny_impdef$(EXESUF) tiny_libmaker$(EXESUF) |
| 123 | NATIVE_FILES=$(WIN32_FILES) | 123 | NATIVE_FILES=$(WIN32_FILES) |
| 124 | PROGS_CROSS=$(WIN64_CROSS) $(I386_CROSS) $(X64_CROSS) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS) | 124 | PROGS_CROSS=$(WIN64_CROSS) $(I386_CROSS) $(X64_CROSS) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS) |
| 125 | LIBTCC1_CROSS=lib/x86_64-win32/libtcc1.a | 125 | LIBTCC1_CROSS=lib/x86_64-win/libtcc1.a |
| 126 | LIBTCC1=libtcc1.a | 126 | LIBTCC1=libtcc1.a |
| 127 | else ifeq ($(ARCH),i386) | 127 | else ifeq ($(ARCH),i386) |
| 128 | NATIVE_FILES=$(I386_FILES) | 128 | NATIVE_FILES=$(I386_FILES) |
| 129 | PROGS_CROSS=$(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS) | 129 | PROGS_CROSS=$(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS) |
| 130 | LIBTCC1_CROSS=lib/i386-win32/libtcc1.a lib/x86_64-win32/libtcc1.a | 130 | LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a |
| 131 | LIBTCC1=libtcc1.a | 131 | LIBTCC1=libtcc1.a |
| 132 | else ifeq ($(ARCH),x86-64) | 132 | else ifeq ($(ARCH),x86-64) |
| 133 | NATIVE_FILES=$(X86_64_FILES) | 133 | NATIVE_FILES=$(X86_64_FILES) |
| 134 | PROGS_CROSS=$(I386_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS) | 134 | PROGS_CROSS=$(I386_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS) |
| 135 | LIBTCC1_CROSS=lib/i386-win32/libtcc1.a lib/x86_64-win32/libtcc1.a lib/i386/libtcc1.a | 135 | LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/i386/libtcc1.a |
| 136 | LIBTCC1=libtcc1.a | 136 | LIBTCC1=libtcc1.a |
| 137 | else ifeq ($(ARCH),arm) | 137 | else ifeq ($(ARCH),arm) |
| 138 | NATIVE_FILES=$(ARM_FILES) | 138 | NATIVE_FILES=$(ARM_FILES) |
| 139 | PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS) | 139 | PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS) |
| 140 | LIBTCC1=libtcc1.a | 140 | LIBTCC1=libtcc1.a |
| 141 | LIBTCC1_CROSS=lib/i386-win32/libtcc1.a lib/x86_64-win32/libtcc1.a lib/i386/libtcc1.a | 141 | LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/i386/libtcc1.a |
| 142 | else ifeq ($(ARCH),arm64) | 142 | else ifeq ($(ARCH),arm64) |
| 143 | NATIVE_FILES=$(ARM64_FILES) | 143 | NATIVE_FILES=$(ARM64_FILES) |
| 144 | PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(C67_CROSS) $(WINCE_CROSS) | 144 | PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(C67_CROSS) $(WINCE_CROSS) |
| 145 | LIBTCC1=libtcc1.a | 145 | LIBTCC1=libtcc1.a |
| 146 | LIBTCC1_CROSS=lib/i386-win32/libtcc1.a lib/x86_64-win32/libtcc1.a lib/i386/libtcc1.a | 146 | LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/i386/libtcc1.a |
| 147 | endif | 147 | endif |
| 148 | PROGS_CROSS_LINK=$(foreach PROG_CROSS,$(PROGS_CROSS),$($(PROG_CROSS)_LINK)) | 148 | PROGS_CROSS_LINK=$(foreach PROG_CROSS,$(PROGS_CROSS),$($(PROG_CROSS)_LINK)) |
| 149 | 149 | ||
| @@ -291,8 +291,8 @@ ifneq ($(ARCH),i386) · 141 unmodified lines | |||
| 291 | cp -r "$(tccdir)/include" "$(tccdir)/i386" | 291 | cp -r "$(tccdir)/include" "$(tccdir)/i386" |
| 292 | endif | 292 | endif |
| 293 | $(INSTALL) -m644 $(top_srcdir)/win32/lib/*.def "$(tccdir)/win32/lib" | 293 | $(INSTALL) -m644 $(top_srcdir)/win32/lib/*.def "$(tccdir)/win32/lib" |
| 294 | $(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(tccdir)/win32/lib/32" | 294 | $(INSTALL) -m644 lib/i386-win/libtcc1.a "$(tccdir)/win32/lib/32" |
| 295 | $(INSTALL) -m644 lib/x86_64-win32/libtcc1.a "$(tccdir)/win32/lib/64" | 295 | $(INSTALL) -m644 lib/x86_64-win/libtcc1.a "$(tccdir)/win32/lib/64" |
| 296 | cp -r $(top_srcdir)/win32/include/. "$(tccdir)/win32/include" | 296 | cp -r $(top_srcdir)/win32/include/. "$(tccdir)/win32/include" |
| 297 | cp -r "$(tccdir)/include" "$(tccdir)/win32" | 297 | cp -r "$(tccdir)/include" "$(tccdir)/win32" |
| 298 | endif | 298 | endif |
| @@ -330,8 +330,8 @@ install: $(PROGS) $(TCCLIBS) $(TCCDOCS) · 31 unmodified lines | |||
| 330 | ifdef CONFIG_CROSS | 330 | ifdef CONFIG_CROSS |
| 331 | mkdir -p "$(tccdir)/lib/32" | 331 | mkdir -p "$(tccdir)/lib/32" |
| 332 | mkdir -p "$(tccdir)/lib/64" | 332 | mkdir -p "$(tccdir)/lib/64" |
| 333 | -$(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(tccdir)/lib/32" | 333 | -$(INSTALL) -m644 lib/i386-win/libtcc1.a "$(tccdir)/lib/32" |
| 334 | -$(INSTALL) -m644 lib/x86_64-win32/libtcc1.a "$(tccdir)/lib/64" | 334 | -$(INSTALL) -m644 lib/x86_64-win/libtcc1.a "$(tccdir)/lib/64" |
| 335 | endif | 335 | endif |
| 336 | 336 | ||
| 337 | uninstall: | 337 | uninstall: |
| @@ -8,10 +8,10 @@ VPATH = $(top_srcdir)/lib $(top_srcdir)/win32/lib · 7 unmodified lines | |||
| 8 | 8 | ||
| 9 | ifndef TARGET # native library | 9 | ifndef TARGET # native library |
| 10 | ifdef CONFIG_WIN64 | 10 | ifdef CONFIG_WIN64 |
| 11 | TARGET = x86_64-win32 | 11 | TARGET = x86_64-win |
| 12 | else | 12 | else |
| 13 | ifdef CONFIG_WIN32 | 13 | ifdef CONFIG_WIN32 |
| 14 | TARGET = i386-win32 | 14 | TARGET = i386-win |
| 15 | else | 15 | else |
| 16 | ifeq ($(ARCH),i386) | 16 | ifeq ($(ARCH),i386) |
| 17 | TARGET = i386 | 17 | TARGET = i386 |
| @@ -57,14 +57,14 @@ PICFLAGS = -fPIC · 39 unmodified lines | |||
| 57 | # correctly | 57 | # correctly |
| 58 | CFLAGS := $(filter-out -fstack-protector-strong,$(CFLAGS)) | 58 | CFLAGS := $(filter-out -fstack-protector-strong,$(CFLAGS)) |
| 59 | 59 | ||
| 60 | ifeq "$(TARGET)" "i386-win32" | 60 | ifeq "$(TARGET)" "i386-win" |
| 61 | OBJ = $(addprefix $(DIR)/,$(WIN32_O)) | 61 | OBJ = $(addprefix $(DIR)/,$(WIN32_O)) |
| 62 | TGT = -DTCC_TARGET_I386 -DTCC_TARGET_PE | 62 | TGT = -DTCC_TARGET_I386 -DTCC_TARGET_PE |
| 63 | XCC = $(TCC) -B$(top_srcdir)/win32 -I$(top_srcdir)/include | 63 | XCC = $(TCC) -B$(top_srcdir)/win32 -I$(top_srcdir)/include |
| 64 | XAR = $(DIR)/tiny_libmaker$(EXESUF) | 64 | XAR = $(DIR)/tiny_libmaker$(EXESUF) |
| 65 | PICFLAGS = | 65 | PICFLAGS = |
| 66 | else | 66 | else |
| 67 | ifeq "$(TARGET)" "x86_64-win32" | 67 | ifeq "$(TARGET)" "x86_64-win" |
| 68 | OBJ = $(addprefix $(DIR)/,$(WIN64_O)) | 68 | OBJ = $(addprefix $(DIR)/,$(WIN64_O)) |
| 69 | TGT = -DTCC_TARGET_X86_64 -DTCC_TARGET_PE | 69 | TGT = -DTCC_TARGET_X86_64 -DTCC_TARGET_PE |
| 70 | XCC = $(TCC) -B$(top_srcdir)/win32 -I$(top_srcdir)/include | 70 | XCC = $(TCC) -B$(top_srcdir)/win32 -I$(top_srcdir)/include |
| @@ -126,4 +126,4 @@ $(DIR)/exists : · 55 unmodified lines | |||
| 126 | @echo $@ > $@ | 126 | @echo $@ > $@ |
| 127 | 127 | ||
| 128 | clean : | 128 | clean : |
| 129 | rm -rfv i386-win32 x86_64-win32 i386 x86_64 | 129 | rm -rfv i386-win x86_64-win i386 x86_64 |