History

build: restore out-of-tree support

grischka committed 10 years ago

Commit afdbc5b1 parent 0a624786 files · +58 −48Browse files

Showing the changes to lib (1 of 6 files). Show all

Unified · Split

lib/Makefile+8−8
@@ -4,7 +4,7 @@ · 3 unmodified lines
4 4
5TOP = ..5TOP = ..
6include $(TOP)/Makefile6include $(TOP)/Makefile
7VPATH = $(TOP)/lib $(TOP)/win32/lib7VPATH = $(TOPSRC)/lib $(TOPSRC)/win32/lib
8 8
9ifndef TARGET9ifndef TARGET
10 # we're building the native libtcc1.a10 # we're building the native libtcc1.a
@@ -51,31 +51,31 @@ PICFLAGS = -fPIC · 40 unmodified lines
51ifeq "$(TARGET)" "i386-win32"51ifeq "$(TARGET)" "i386-win32"
52 OBJ = $(addprefix $(DIR)/,$(WIN32_O))52 OBJ = $(addprefix $(DIR)/,$(WIN32_O))
53 TGT = -DTCC_TARGET_I386 -DTCC_TARGET_PE53 TGT = -DTCC_TARGET_I386 -DTCC_TARGET_PE
54 XCC = $(TCC) -B$(TOP)/win32 -I$(TOP)/include54 XCC = $(TCC) -B$(TOPSRC)/win32 -I$(TOPSRC)/include
55 XAR = $(DIR)/tiny_libmaker$(EXESUF)55 XAR = $(DIR)/tiny_libmaker$(EXESUF)
56 XFLAGS = $(TGT)56 XFLAGS = $(TGT)
57else ifeq "$(TARGET)" "x86_64-win32"57else ifeq "$(TARGET)" "x86_64-win32"
58 OBJ = $(addprefix $(DIR)/,$(WIN64_O))58 OBJ = $(addprefix $(DIR)/,$(WIN64_O))
59 TGT = -DTCC_TARGET_X86_64 -DTCC_TARGET_PE59 TGT = -DTCC_TARGET_X86_64 -DTCC_TARGET_PE
60 XCC = $(TCC) -B$(TOP)/win32 -I$(TOP)/include60 XCC = $(TCC) -B$(TOPSRC)/win32 -I$(TOPSRC)/include
61 XAR = $(DIR)/tiny_libmaker$(EXESUF)61 XAR = $(DIR)/tiny_libmaker$(EXESUF)
62 XFLAGS = $(TGT)62 XFLAGS = $(TGT)
63else ifeq "$(TARGET)" "i386"63else ifeq "$(TARGET)" "i386"
64 OBJ = $(addprefix $(DIR)/,$(I386_O))64 OBJ = $(addprefix $(DIR)/,$(I386_O))
65 TGT = -DTCC_TARGET_I38665 TGT = -DTCC_TARGET_I386
66 XCC ?= $(TCC) -B$(TOP)66 XCC ?= $(TCC) -B$(TOPSRC)
67else ifeq "$(TARGET)" "x86_64"67else ifeq "$(TARGET)" "x86_64"
68 OBJ = $(addprefix $(DIR)/,$(X86_64_O))68 OBJ = $(addprefix $(DIR)/,$(X86_64_O))
69 TGT = -DTCC_TARGET_X86_6469 TGT = -DTCC_TARGET_X86_64
70 XCC ?= $(TCC) -B$(TOP)70 XCC ?= $(TCC) -B$(TOPSRC)
71else ifeq "$(TARGET)" "arm"71else ifeq "$(TARGET)" "arm"
72 OBJ = $(addprefix $(DIR)/,$(ARM_O))72 OBJ = $(addprefix $(DIR)/,$(ARM_O))
73 TGT = -DTCC_TARGET_ARM73 TGT = -DTCC_TARGET_ARM
74 XCC ?= $(TCC) -B$(TOP)74 XCC ?= $(TCC) -B$(TOPSRC)
75else ifeq "$(TARGET)" "arm64"75else ifeq "$(TARGET)" "arm64"
76 OBJ = $(addprefix $(DIR)/,$(ARM64_O))76 OBJ = $(addprefix $(DIR)/,$(ARM64_O))
77 TGT = -DTCC_TARGET_ARM6477 TGT = -DTCC_TARGET_ARM64
78 XCC ?= $(TCC) -B$(top_srcdir)78 XCC ?= $(TCC) -B$(TOPSRC)
79else79else
80 $(error libtcc1.a not supported on target '$(TARGET)')80 $(error libtcc1.a not supported on target '$(TARGET)')
81endif81endif
@@ -99,7 +99,7 @@ $(DIR)/%.o : %.c · 17 unmodified lines
99$(DIR)/%.o : %.S99$(DIR)/%.o : %.S
100 $(XCC) -c $< -o $@ $(XFLAGS)100 $(XCC) -c $< -o $@ $(XFLAGS)
101# windows : utilities101# windows : utilities
102$(DIR)/tiny_%$(EXESUF) : $(TOP)/win32/tools/tiny_%.c102$(DIR)/tiny_%$(EXESUF) : $(TOPSRC)/win32/tools/tiny_%.c
103 $(CC) -o $@ $< $(CFLAGS) $(LDFLAGS) $(TGT)103 $(CC) -o $@ $< $(CFLAGS) $(LDFLAGS) $(TGT)
104 104
105$(OBJ) $(XAR) : $(DIR)/exists105$(OBJ) $(XAR) : $(DIR)/exists

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t