Unified · Split
| @@ -5,6 +5,7 @@ · 4 unmodified lines | ||
| 5 | 5 | TOP ?= . |
| 6 | 6 | include $(TOP)/config.mak |
| 7 | 7 | TCC=./tcc |
| 8 | +LIBTCC1_DIR= $(TOP) | |
| 8 | 9 | CFLAGS+=-g -Wall |
| 9 | 10 | CFLAGS_P=$(CFLAGS) -pg -static -DCONFIG_TCC_STATIC |
| 10 | 11 | LIBS_P= |
| @@ -185,12 +186,6 @@ libtcc.so.1.0: $(LIBTCC_OBJ) · 174 unmodified lines | ||
| 185 | 186 | libtcc_test$(EXESUF): tests/libtcc_test.c $(LIBTCCB) |
| 186 | 187 | $(CC) -o $@ $^ -I. $(CFLAGS) $(LIBS) $(LIBTCCL) |
| 187 | 188 | |
| 188 | −# use i386-win32-tcc instead of tcc.exe to build libtcc1.a on Linux | |
| 189 | −# ar t libtcc1.a will list the ELF objects | |
| 190 | −LinuxWIN32libtcc1: $(WIN32_CROSS) | |
| 191 | − $(MAKE) ARCH=i386 CONFIG_WIN32=1 TCC=./i386-win32-tcc libtcc1.a | |
| 192 | − @-mv libtcc1.a win32/lib | |
| 193 | − | |
| 194 | 189 | libtest: libtcc_test$(EXESUF) $(LIBTCC1) |
| 195 | 190 | ./libtcc_test$(EXESUF) lib_path=. |
| 196 | 191 | |
| @@ -209,6 +204,12 @@ LIBTCC1_OBJS=libtcc1.o $(ALLOCA_O) · 12 unmodified lines | ||
| 209 | 204 | LIBTCC1_CC=$(CC) |
| 210 | 205 | VPATH+=lib |
| 211 | 206 | |
| 207 | +# use i386-win32-tcc (WIN32_CROSS) to build libtcc1.a on Linux | |
| 208 | +# ar t libtcc1.a will list the ELF objects | |
| 209 | +LinuxWIN32libtcc1: $(WIN32_CROSS) | |
| 210 | + $(MAKE) TCC=./i386-win32-tcc LIBTCC1_DIR=win32/lib ARCH=i386 \ | |
| 211 | + CONFIG_WIN32=1 CFLAGS+="-Bwin32 -Iinclude" ./win32/lib/libtcc1.a | |
| 212 | + | |
| 212 | 213 | ifdef CONFIG_WIN32 |
| 213 | 214 | # for windows, we must use TCC because we generate ELF objects |
| 214 | 215 | LIBTCC1_OBJS+=crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o bcheck.o |
| @@ -221,7 +222,7 @@ endif · 6 unmodified lines | ||
| 221 | 222 | %.o: %.S |
| 222 | 223 | $(LIBTCC1_CC) -o $@ -c $< |
| 223 | 224 | |
| 224 | −libtcc1.a: $(LIBTCC1_OBJS) | |
| 225 | +$(LIBTCC1_DIR)/libtcc1.a: $(LIBTCC1_OBJS) | |
| 225 | 226 | $(AR) rcs $@ $^ |
| 226 | 227 | |
| 227 | 228 | # install |