Unified · Split
| @@ -40,18 +40,17 @@ pre: · 39 unmodified lines | ||
| 40 | 40 | @echo TOPSRC=$$\(TOP\) 1>> ../config.mak |
| 41 | 41 | @echo "#define TCC_VERSION \"$(VERSION)\"" 1>../config.h |
| 42 | 42 | @echo "#ifdef TCC_TARGET_X86_64" 1>>../config.h |
| 43 | − @echo "#define CONFIG_TCC_LIBPATHS \"{B}/lib/64;{B}/lib\"" 1>>../config.h | |
| 43 | + @echo "#define TCC_LIBTCC1 \"libtcc1-64.a\"" 1>>../config.h | |
| 44 | 44 | @echo "#else" 1>>../config.h |
| 45 | − @echo "#define CONFIG_TCC_LIBPATHS \"{B}/lib/32;{B}/lib\"" 1>>../config.h | |
| 45 | + @echo "#define TCC_LIBTCC1 \"libtcc1-32.a\"" 1>>../config.h | |
| 46 | 46 | @echo "#endif" 1>>../config.h |
| 47 | 47 | @echo @set VERSION $(VERSION) 1>../config.texi |
| 48 | 48 | @rm -f *tcc.exe tiny_*.exe *tcc.dll |
| 49 | 49 | @rm -r -f libtcc |
| 50 | − @rm -r -f libtcc doc lib/32 lib/64 | |
| 50 | + @rm -r -f libtcc doc lib | |
| 51 | 51 | @mkdir libtcc |
| 52 | 52 | @mkdir doc |
| 53 | − @mkdir lib/32 | |
| 54 | − @mkdir lib/64 | |
| 53 | + @mkdir lib | |
| 55 | 54 | @cp ../include/*.h include |
| 56 | 55 | @cp ../tcclib.h include |
| 57 | 56 | @cp ../libtcc.h include |
| @@ -69,7 +68,7 @@ bootstrap: · 11 unmodified lines | ||
| 69 | 68 | |
| 70 | 69 | PHONY += bootstrap |
| 71 | 70 | |
| 72 | −lib/32/libtcc1.a: | |
| 71 | +lib/libtcc1-32.a: | |
| 73 | 72 | @echo Building $*.a with tcc -m32 |
| 74 | 73 | @./tcc -m32 -DTCC_TARGET_PE -DTCC_TARGET_I386 -c ../lib/libtcc1.c |
| 75 | 74 | @./tcc -m32 -DTCC_TARGET_PE -DTCC_TARGET_I386 -c ../lib/alloca86.S |
| @@ -81,10 +80,10 @@ lib/32/libtcc1.a: · 5 unmodified lines | ||
| 81 | 80 | @./tcc -m32 -DTCC_TARGET_PE -DTCC_TARGET_I386 -c lib/dllcrt1.c |
| 82 | 81 | @./tcc -m32 -DTCC_TARGET_PE -DTCC_TARGET_I386 -c lib/dllmain.c |
| 83 | 82 | @./tcc -m32 -DTCC_TARGET_PE -DTCC_TARGET_I386 -c lib/chkstk.S |
| 84 | − @./tcc -m32 -ar lib/32/libtcc1.a libtcc1.o alloca86.o alloca86-bt.o crt1.o wincrt1.o crt1w.o wincrt1w.o dllcrt1.o dllmain.o chkstk.o | |
| 83 | + @./tcc -m32 -ar lib/libtcc1-32.a libtcc1.o alloca86.o alloca86-bt.o crt1.o wincrt1.o crt1w.o wincrt1w.o dllcrt1.o dllmain.o chkstk.o | |
| 85 | 84 | @rm *.o |
| 86 | 85 | |
| 87 | −lib/64/libtcc1.a: | |
| 86 | +lib/libtcc1-64.a: | |
| 88 | 87 | @echo Building $*.a with tcc -m64 |
| 89 | 88 | @./tcc -m64 -DTCC_TARGET_PE -DTCC_TARGET_X86_64 -c ../lib/libtcc1.c |
| 90 | 89 | @./tcc -m64 -DTCC_TARGET_PE -DTCC_TARGET_X86_64 -c ../lib/alloca86_64.S |
| @@ -96,10 +95,10 @@ lib/64/libtcc1.a: · 5 unmodified lines | ||
| 96 | 95 | @./tcc -m64 -DTCC_TARGET_PE -DTCC_TARGET_X86_64 -c lib/dllcrt1.c |
| 97 | 96 | @./tcc -m64 -DTCC_TARGET_PE -DTCC_TARGET_X86_64 -c lib/dllmain.c |
| 98 | 97 | @./tcc -m64 -DTCC_TARGET_PE -DTCC_TARGET_X86_64 -c lib/chkstk.S |
| 99 | − @./tcc -m64 -ar lib/64/libtcc1.a libtcc1.o alloca86_64.o alloca86_64-bt.o crt1.o wincrt1.o crt1w.o wincrt1w.o dllcrt1.o dllmain.o chkstk.o | |
| 98 | + @./tcc -m64 -ar lib/libtcc1-64.a libtcc1.o alloca86_64.o alloca86_64-bt.o crt1.o wincrt1.o crt1w.o wincrt1w.o dllcrt1.o dllmain.o chkstk.o | |
| 100 | 99 | @rm *.o |
| 101 | 100 | |
| 102 | −libs: lib/32/libtcc1.a lib/64/libtcc1.a | |
| 101 | +libs: lib/libtcc1-32.a lib/libtcc1-64.a | |
| 103 | 102 | |
| 104 | 103 | PHONY += libs |
| 105 | 104 | |