History

build of cross compilers is optional - win32 merge

bellard committed 21 years ago

Commit 7baf9681 parent acc4f881 file · +74 −16Browse files

Unified · Split

Makefile+74−16
@@ -20,7 +20,31 @@ endif · 19 unmodified lines
2020
2121 DISAS=objdump -d
2222 INSTALL=install
23−PROGS=tcc$(EXESUF) c67-tcc$(EXESUF) arm-tcc$(EXESUF) i386-win32-tcc$(EXESUF)
23+
24+ifdef CONFIG_WIN32
25+PROGS=tcc$(EXESUF)
26+ifdef CONFIG_CROSS
27+PROGS+=c67-tcc$(EXESUF) arm-tcc$(EXESUF)
28+endif
29+PROGS+=tiny_impdef$(EXESUF)
30+else
31+ifeq ($(ARCH),i386)
32+PROGS=tcc$(EXESUF)
33+ifdef CONFIG_CROSS
34+PROGS+=arm-tcc$(EXESUF)
35+endif
36+endif
37+ifeq ($(ARCH),arm)
38+PROGS=tcc$(EXESUF)
39+ifdef CONFIG_CROSS
40+PROGS+=i386-tcc$(EXESUF)
41+endif
42+endif
43+ifdef CONFIG_CROSS
44+PROGS+=c67-tcc$(EXESUF) i386-win32-tcc$(EXESUF)
45+endif
46+endif
47+
2448 # run local version of tcc with local libraries and includes
2549 TCC=./tcc -B. -I.
2650
@@ -111,28 +135,52 @@ ex2: ex2.c · 84 unmodified lines
111135 ex3: ex3.c
112136 $(CC) $(CFLAGS) -o $@ $<
113137
114−# Native Tiny C Compiler
115−
116−tcc_g$(EXESUF): tcc.c i386-gen.c tccelf.c tccasm.c i386-asm.c tcctok.h libtcc.h i386-asm.h Makefile
138+# Host Tiny C Compiler
139+ifdef CONFIG_WIN32
140+tcc$(EXESUF): tcc.c i386-gen.c tccelf.c tccasm.c i386-asm.c tcctok.h libtcc.h i386-asm.h tccpe.c
141+ $(CC) $(CFLAGS) -DTCC_TARGET_PE -o $@ $< $(LIBS)
142+else
143+ifeq ($(ARCH),i386)
144+tcc$(EXESUF): tcc.c i386-gen.c tccelf.c tccasm.c i386-asm.c tcctok.h libtcc.h i386-asm.h
117145 $(CC) $(CFLAGS) -o $@ $< $(LIBS)
146+endif
147+ifeq ($(ARCH),arm)
148+tcc$(EXESUF): tcc.c arm-gen.c tccelf.c tccasm.c tcctok.h libtcc.h
149+ $(CC) $(CFLAGS) -DTCC_TARGET_ARM -o $@ $< $(LIBS)
150+endif
151+endif
118152
119−tcc$(EXESUF): tcc_g$(EXESUF) Makefile
120− $(STRIP) -o $@ $<
153+# Cross Tiny C Compilers
154+i386-tcc$(EXESUF): tcc.c i386-gen.c tccelf.c tccasm.c i386-asm.c tcctok.h libtcc.h i386-asm.h
155+ $(CC) $(CFLAGS) -o $@ $< $(LIBS)
121156
122−c67-tcc$(EXESUF): tcc.c c67-gen.c tccelf.c tccasm.c tcctok.h libtcc.h tcccoff.c Makefile
157+c67-tcc$(EXESUF): tcc.c c67-gen.c tccelf.c tccasm.c tcctok.h libtcc.h tcccoff.c
123158 $(CC) $(CFLAGS) -DTCC_TARGET_C67 -o $@ $< $(LIBS)
124159
125−arm-tcc$(EXESUF): tcc.c arm-gen.c tccelf.c tccasm.c tcctok.h libtcc.h Makefile
160+arm-tcc$(EXESUF): tcc.c arm-gen.c tccelf.c tccasm.c tcctok.h libtcc.h
126161 $(CC) $(CFLAGS) -DTCC_TARGET_ARM -o $@ $< $(LIBS)
127162
128−i386-win32-tcc$(EXESUF): tcc.c i386-gen.c tccelf.c tccasm.c i386-asm.c tcctok.h libtcc.h i386-asm.h tccpe.c Makefile
163+i386-win32-tcc$(EXESUF): tcc.c i386-gen.c tccelf.c tccasm.c i386-asm.c tcctok.h libtcc.h i386-asm.h tccpe.c
129164 $(CC) $(CFLAGS) -DTCC_TARGET_PE -o $@ $< $(LIBS)
130165
166+# windows utilities
167+tiny_impdef$(EXESUF): tiny_impdef.c
168+ $(CC) $(CFLAGS) -o $@ $< -lkernel32
169+
131170 # TinyCC runtime libraries
132−libtcc1.o: libtcc1.c
171+ifdef CONFIG_WIN32
172+LIBTCC1_OBJS=$(addprefix win32/lib/, crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o) libtcc1.o
173+else
174+LIBTCC1_OBJS=libtcc1.o
175+endif
176+
177+%.o: %.c
133178 $(CC) -O2 -Wall -c -o $@ $<
134179
135−libtcc1$(LIBSUF): libtcc1.o
180+%.o: %.S
181+ $(CC) -c -o $@ $<
182+
183+libtcc1$(LIBSUF): $(LIBTCC1_OBJS)
136184 $(AR) rcs $@ $^
137185
138186 bcheck.o: bcheck.c
@@ -147,19 +195,29 @@ ifndef CONFIG_WIN32 · 8 unmodified lines
147195 mkdir -p "$(mandir)/man1"
148196 $(INSTALL) tcc.1 "$(mandir)/man1"
149197 endif
150− mkdir -p "$(libdir)/tcc"
151− mkdir -p "$(libdir)/tcc/include"
152− $(INSTALL) -m644 libtcc1$(LIBSUF) $(BCHECK_O) "$(libdir)/tcc"
198+ mkdir -p "$(tccdir)"
199+ mkdir -p "$(tccdir)/include"
200+ mkdir -p "$(tccdir)/lib"
201+ifdef CONFIG_WIN32
202+ $(INSTALL) -m644 libtcc1$(LIBSUF) win32/lib/*.def "$(tccdir)/lib"
203+ cp -r win32/include "$(tccdir)/include"
204+ cp -r win32/examples "$(tccdir)/examples"
205+else
206+ $(INSTALL) -m644 libtcc1$(LIBSUF) $(BCHECK_O) "$(tccdir)/lib"
153207 $(INSTALL) -m644 stdarg.h stddef.h stdbool.h float.h varargs.h \
154− tcclib.h "$(libdir)/tcc/include"
208+ tcclib.h "$(tccdir)/include"
209+endif
155210 mkdir -p "$(docdir)"
156211 $(INSTALL) -m644 tcc-doc.html "$(docdir)"
212+ifdef CONFIG_WIN32
213+ $(INSTALL) -m644 win32/readme.txt "$(docdir)"
214+endif
157215
158216 clean:
159217 rm -f *~ *.o tcc tcc1 tcct tcc_g tcctest.ref *.bin *.i ex2 \
160218 core gmon.out test.out test.ref a.out tcc_p \
161219 *.exe tcc-doc.html tcc.pod tcc.1 libtcc$(LIBSUF) libtcc_test \
162− tcctest[1234] test[1234].out c67-tcc arm-tcc
220+ tcctest[1234] test[1234].out $(PROGS) win32/lib/*.o
163221
164222 distclean: clean
165223 rm -f config.h config.mak config.texi

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