History

win32 configure

bellard committed 22 years ago

Commit 13affef1 parent c50af836 files · +92 −51Browse files

Unified · Split

6 files
  1. Changelog +1 −0
  2. Makefile +40 −36
  3. VERSION +1 −1
  4. configure +48 −11
  5. libtcc_test.c +1 −1
  6. tcc.c +1 −2
Changelog+1−0
@@ -6,6 +6,7 @@ version 0.9.21: · 5 unmodified lines
66 - fixed assignment of const struct in struct
77 - line comment fix (reported by Bertram Felgenhauer)
88 - initial TMS320C67xx target support (TK)
9+- win32 configure
910
1011 version 0.9.20:
1112
Makefile+40−36
@@ -4,7 +4,10 @@ · 3 unmodified lines
44 include config.mak
55
66 CFLAGS=-O2 -g -Wall
7+ifndef CONFIG_WIN32
78 LIBS=-ldl
9+BCHECK_O=bcheck.o
10+endif
811 CFLAGS_P=$(CFLAGS) -pg -static -DCONFIG_TCC_STATIC
912 LIBS_P=
1013
@@ -17,11 +20,13 @@ endif · 6 unmodified lines
1720
1821 DISAS=objdump -d
1922 INSTALL=install
20−
23+PROGS=tcc$(EXESUF) c67-tcc$(EXESUF) arm-tcc$(EXESUF)
2124 # run local version of tcc with local libraries and includes
2225 TCC=./tcc -B. -I.
2326
24−all: tcc libtcc1.a bcheck.o tcc-doc.html tcc.1 libtcc.a libtcc_test
27+all: $(PROGS) \
28+ libtcc1$(LIBSUF) $(BCHECK_O) tcc-doc.html tcc.1 libtcc$(LIBSUF) \
29+ libtcc_test$(EXESUF)
2530
2631 Makefile: config.mak
2732
@@ -108,23 +113,23 @@ ex3: ex3.c · 80 unmodified lines
108113
109114 # Native Tiny C Compiler
110115
111−tcc_g: tcc.c i386-gen.c tccelf.c tccasm.c i386-asm.c tcctok.h libtcc.h i386-asm.h Makefile
116+tcc_g$(EXESUF): tcc.c i386-gen.c tccelf.c tccasm.c i386-asm.c tcctok.h libtcc.h i386-asm.h Makefile
112117 $(CC) $(CFLAGS) -o $@ $< $(LIBS)
113118
114−tcc: tcc_g Makefile
115− strip -s -R .comment -R .note -o $@ $<
119+tcc$(EXESUF): tcc_g$(EXESUF) Makefile
120+ $(STRIP) -o $@ $<
116121
117−c67-tcc: tcc.c c67-gen.c tccelf.c tccasm.c tcctok.h libtcc.h tcccoff.c Makefile
122+c67-tcc$(EXESUF): tcc.c c67-gen.c tccelf.c tccasm.c tcctok.h libtcc.h tcccoff.c Makefile
118123 $(CC) $(CFLAGS) -DTCC_TARGET_C67 -o $@ $< $(LIBS)
119124
120−arm-tcc: tcc.c arm-gen.c tccelf.c tccasm.c tcctok.h libtcc.h Makefile
125+arm-tcc$(EXESUF): tcc.c arm-gen.c tccelf.c tccasm.c tcctok.h libtcc.h Makefile
121126 $(CC) $(CFLAGS) -DTCC_TARGET_ARM -o $@ $< $(LIBS)
122127
123128 # TinyCC runtime libraries
124129 libtcc1.o: libtcc1.c
125130 $(CC) -O2 -Wall -c -o $@ $<
126131
127−libtcc1.a: libtcc1.o
132+libtcc1$(LIBSUF): libtcc1.o
128133 $(AR) rcs $@ $^
129134
130135 bcheck.o: bcheck.c
@@ -132,52 +137,49 @@ bcheck.o: bcheck.c · 1 unmodified line
132137
133138 install: tcc_install libinstall
134139
135−tcc_install: tcc tcc.1 libtcc1.a bcheck.o
136− mkdir -p $(bindir)
137− $(INSTALL) -m755 tcc $(bindir)
138− mkdir -p $(mandir)/man1
139− $(INSTALL) tcc.1 $(mandir)/man1
140− mkdir -p $(libdir)/tcc
141− mkdir -p $(libdir)/tcc/include
142− $(INSTALL) -m644 libtcc1.a bcheck.o $(libdir)/tcc
140+tcc_install: $(PROGS) tcc.1 libtcc1$(LIBSUF) $(BCHECK_O) tcc-doc.html tcc.1
141+ mkdir -p "$(bindir)"
142+ $(INSTALL) -s -m755 $(PROGS) "$(bindir)"
143+ifndef CONFIG_WIN32
144+ mkdir -p "$(mandir)/man1"
145+ $(INSTALL) tcc.1 "$(mandir)/man1"
146+endif
147+ mkdir -p "$(libdir)/tcc"
148+ mkdir -p "$(libdir)/tcc/include"
149+ $(INSTALL) -m644 libtcc1$(LIBSUF) $(BCHECK_O) "$(libdir)/tcc"
143150 $(INSTALL) -m644 stdarg.h stddef.h stdbool.h float.h varargs.h \
144− tcclib.h $(libdir)/tcc/include
151+ tcclib.h "$(libdir)/tcc/include"
152+ mkdir -p "$(docdir)"
153+ $(INSTALL) -m644 tcc-doc.html "$(docdir)"
145154
146155 clean:
147156 rm -f *~ *.o tcc tcc1 tcct tcc_g tcctest.ref *.bin *.i ex2 \
148157 core gmon.out test.out test.ref a.out tcc_p \
149− *.exe tcc-doc.html tcc.pod tcc.1 libtcc.a libtcc_test \
150− tcctest[1234] test[1234].out
158+ *.exe tcc-doc.html tcc.pod tcc.1 libtcc$(LIBSUF) libtcc_test \
159+ tcctest[1234] test[1234].out c67-tcc arm-tcc
151160
152161 distclean: clean
153162 rm -f config.h config.mak config.texi
154163
155−# win32 TCC
156−tcc_g.exe: tcc.c i386-gen.c bcheck.c Makefile
157− i386-mingw32msvc-gcc $(CFLAGS) -DCONFIG_TCC_STATIC -o $@ $<
158−
159−tcc.exe: tcc_g.exe
160− i386-mingw32msvc-strip -o $@ $<
161−
162164 # profiling version
163165 tcc_p: tcc.c Makefile
164166 $(CC) $(CFLAGS_P) -o $@ $< $(LIBS_P)
165167
166168 # libtcc generation and example
167−libinstall: libtcc.a
168− mkdir -p $(libdir)
169− $(INSTALL) -m644 libtcc.a $(libdir)
170− mkdir -p $(includedir)
171− $(INSTALL) -m644 libtcc.h $(includedir)
169+libinstall: libtcc$(LIBSUF)
170+ mkdir -p "$(libdir)"
171+ $(INSTALL) -m644 libtcc$(LIBSUF) "$(libdir)"
172+ mkdir -p "$(includedir)"
173+ $(INSTALL) -m644 libtcc.h "$(includedir)"
172174
173−libtcc.o: tcc.c i386-gen.c bcheck.c Makefile
175+libtcc.o: tcc.c i386-gen.c Makefile
174176 $(CC) $(CFLAGS) -DLIBTCC -c -o $@ $<
175177
176−libtcc.a: libtcc.o
178+libtcc$(LIBSUF): libtcc.o
177179 $(AR) rcs $@ $^
178180
179−libtcc_test: libtcc_test.c libtcc.a
180− $(CC) $(CFLAGS) -I. -o $@ $< -L. -ltcc -ldl
181+libtcc_test$(EXESUF): libtcc_test.c libtcc$(LIBSUF)
182+ $(CC) $(CFLAGS) -o $@ $< libtcc$(LIBSUF) $(LIBS)
181183
182184 libtest: libtcc_test
183185 ./libtcc_test
@@ -226,7 +228,9 @@ FILES= Makefile Makefile.uClibc configure VERSION \ · 42 unmodified lines
226228 README TODO COPYING \
227229 Changelog tcc-doc.texi tcc-doc.html \
228230 tcc.1 \
229− tcc.c i386-gen.c tccelf.c tcctok.h tccasm.c i386-asm.c i386-asm.h\
231+ tcc.c tccelf.c tcctok.h tccasm.c i386-asm.c i386-asm.h \
232+ tcccoff.c coff.h \
233+ i386-gen.c c67-gen.c arm-gen.c \
230234 bcheck.c libtcc1.c \
231235 elf.h stab.h stab.def \
232236 stddef.h stdarg.h stdbool.h float.h varargs.h \
VERSION+1−1
@@ -1 +1 @@
1−0.9.20
1+0.9.21
configure+48−11
@@ -18,7 +18,7 @@ TMPS="${TMPDIR1}/tcc-conf-${RANDOM}-$$-${RANDOM}.S" · 17 unmodified lines
1818 TMPH="${TMPDIR1}/tcc-conf-${RANDOM}-$$-${RANDOM}.h"
1919
2020 # default parameters
21−prefix="/usr/local"
21+prefix=""
2222 execprefix=""
2323 bindir=""
2424 libdir=""
@@ -56,10 +56,16 @@ case "$cpu" in · 31 unmodified lines
5656 esac
5757 gprof="no"
5858 bigendian="no"
59+mingw32="no"
60+LIBSUF=".a"
61+EXESUF=""
5962
6063 # OS specific
6164 targetos=`uname -s`
6265 case $targetos in
66+MINGW32*)
67+mingw32="yes"
68+;;
6369 *) ;;
6470 esac
6571
@@ -106,6 +112,8 @@ for opt do · 40 unmodified lines
106112 ;;
107113 --enable-gprof) gprof="yes"
108114 ;;
115+ --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-"
116+ ;;
109117 esac
110118 done
111119
@@ -118,6 +126,11 @@ cc="${cross_prefix}${cc}" · 6 unmodified lines
118126 ar="${cross_prefix}${ar}"
119127 strip="${cross_prefix}${strip}"
120128
129+if test "$mingw32" = "yes" ; then
130+ LIBSUF=".lib"
131+ EXESUF=".exe"
132+fi
133+
121134 if test -z "$cross_prefix" ; then
122135
123136 # ---
@@ -188,26 +201,43 @@ echo "" · 64 unmodified lines
188201 exit 1
189202 fi
190203
191−if test x"$execprefix" = x""; then
192−execprefix="${prefix}"
193−fi
194−if test x"$bindir" = x""; then
195−bindir="${execprefix}/bin"
196−fi
204+if test "$mingw32" = "yes" ; then
205+ if test -z "$prefix" ; then
206+ prefix="/c/Program Files/tcc"
207+ fi
208+ execprefix="$prefix"
209+ bindir="$prefix"
210+ docdir="$prefix/doc"
211+else
212+ if test -z "$prefix" ; then
213+ prefix="/usr/local"
214+ fi
215+ if test x"$execprefix" = x""; then
216+ execprefix="${prefix}"
217+ fi
218+ if test x"$bindir" = x""; then
219+ bindir="${execprefix}/bin"
220+ fi
221+ if test x"$docdir" = x""; then
222+ docdir="$prefix/share/doc/qemu"
223+ fi
224+fi # mingw32
225+
197226 if test x"$libdir" = x""; then
198227 libdir="${execprefix}/lib"
199228 fi
200−if test x"$includedir" = x""; then
201−includedir="${prefix}/include"
202−fi
203229 if test x"$mandir" = x""; then
204230 mandir="${prefix}/man"
205231 fi
232+if test x"$includedir" = x""; then
233+includedir="${prefix}/include"
234+fi
206235
207236 echo "Binary directory $bindir"
208237 echo "Library directory $libdir"
209238 echo "Include directory $includedir"
210−echo "Manual directory $mandir"
239+echo "Manual directory $mandir"
240+echo "Doc directory $docdir"
211241 echo "Source path $source_path"
212242 echo "C compiler $cc"
213243 echo "make $make"
@@ -225,6 +255,7 @@ echo "bindir=$bindir" >> config.mak · 11 unmodified lines
225255 echo "libdir=$libdir" >> config.mak
226256 echo "includedir=$includedir" >> config.mak
227257 echo "mandir=$mandir" >> config.mak
258+echo "docdir=$docdir" >> config.mak
228259 echo "#define CONFIG_TCC_LIBDIR \"$libdir\"" >> $TMPH
229260 echo "MAKE=$make" >> config.mak
230261 echo "CC=$cc" >> config.mak
@@ -235,6 +266,8 @@ echo "AR=$ar" >> config.mak · 4 unmodified lines
235266 echo "STRIP=$strip -s -R .comment -R .note" >> config.mak
236267 echo "CFLAGS=$CFLAGS" >> config.mak
237268 echo "LDFLAGS=$LDFLAGS" >> config.mak
269+echo "LIBSUF=$LIBSUF" >> config.mak
270+echo "EXESUF=$EXESUF" >> config.mak
238271 if test "$cpu" = "x86" ; then
239272 echo "ARCH=i386" >> config.mak
240273 echo "#define HOST_I386 1" >> $TMPH
@@ -257,6 +290,10 @@ else · 16 unmodified lines
257290 echo "Unsupported CPU"
258291 exit 1
259292 fi
293+if test "$mingw32" = "yes" ; then
294+ echo "CONFIG_WIN32=yes" >> config.mak
295+ echo "#define CONFIG_WIN32 1" >> $TMPH
296+fi
260297 if test "$bigendian" = "yes" ; then
261298 echo "WORDS_BIGENDIAN=yes" >> config.mak
262299 echo "#define WORDS_BIGENDIAN 1" >> $TMPH
libtcc_test.c+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 #include <stdlib.h>
77 #include <stdio.h>
88
9−#include <libtcc.h>
9+#include "libtcc.h"
1010
1111 /* this function is called by the generated code */
1212 int add(int a, int b)
tcc.c+1−2
@@ -34,6 +34,7 @@ · 33 unmodified lines
3434 #include <time.h>
3535 #ifdef WIN32
3636 #include <sys/timeb.h>
37+#define CONFIG_TCC_STATIC
3738 #endif
3839 #ifndef WIN32
3940 #include <sys/time.h>
@@ -85,13 +86,11 @@ · 45 unmodified lines
8586 #define TCC_TARGET_COFF
8687 #endif
8788
88−#if !defined(WIN32)
8989 #define FALSE 0
9090 #define false 0
9191 #define TRUE 1
9292 #define true 1
9393 typedef int BOOL;
94−#endif
9594
9695 /* path to find crt1.o, crti.o and crtn.o. Only needed when generating
9796 executables or dlls */

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