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