Fossil SCM

Prevent the DMC and MSVC makefile from using XBCC, which was not defined there.

mistachkin 2016-11-08 18:12 trunk
Commit f366e52f63f4fb74f60c180c72a869c0dbf0aee0
1 file changed +12 -12
+12 -12
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1307,26 +1307,26 @@
13071307
writeln "\t+echo. >> \$@"
13081308
writeln "\t+echo fossil >> \$@"
13091309
13101310
writeln {
13111311
translate$E: $(SRCDIR)\translate.c
1312
- $(XBCC) -o$@ $**
1312
+ $(BCC) -o$@ $**
13131313
13141314
makeheaders$E: $(SRCDIR)\makeheaders.c
1315
- $(XBCC) -o$@ $**
1315
+ $(BCC) -o$@ $**
13161316
13171317
mkindex$E: $(SRCDIR)\mkindex.c
1318
- $(XBCC) -o$@ $**
1318
+ $(BCC) -o$@ $**
13191319
13201320
mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
1321
- $(XBCC) -o$@ $**
1321
+ $(BCC) -o$@ $**
13221322
13231323
mkversion$E: $(SRCDIR)\mkversion.c
1324
- $(XBCC) -o$@ $**
1324
+ $(BCC) -o$@ $**
13251325
13261326
codecheck1$E: $(SRCDIR)\codecheck1.c
1327
- $(XBCC) -o$@ $**
1327
+ $(BCC) -o$@ $**
13281328
13291329
$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
13301330
$(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
13311331
13321332
$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
@@ -1829,26 +1829,26 @@
18291829
writeln {
18301830
$(OX):
18311831
@-mkdir $@
18321832
18331833
translate$E: $(SRCDIR)\translate.c
1834
- $(XBCC) $**
1834
+ $(BCC) $**
18351835
18361836
makeheaders$E: $(SRCDIR)\makeheaders.c
1837
- $(XBCC) $**
1837
+ $(BCC) $**
18381838
18391839
mkindex$E: $(SRCDIR)\mkindex.c
1840
- $(XBCC) $**
1840
+ $(BCC) $**
18411841
18421842
mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
1843
- $(XBCC) $**
1843
+ $(BCC) $**
18441844
18451845
mkversion$E: $(SRCDIR)\mkversion.c
1846
- $(XBCC) $**
1846
+ $(BCC) $**
18471847
18481848
codecheck1$E: $(SRCDIR)\codecheck1.c
1849
- $(XBCC) $**
1849
+ $(BCC) $**
18501850
18511851
!if $(USE_SEE)!=0
18521852
SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
18531853
!else
18541854
SQLITE3_SHELL_SRC = $(SRCDIR)\shell.c
18551855
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1307,26 +1307,26 @@
1307 writeln "\t+echo. >> \$@"
1308 writeln "\t+echo fossil >> \$@"
1309
1310 writeln {
1311 translate$E: $(SRCDIR)\translate.c
1312 $(XBCC) -o$@ $**
1313
1314 makeheaders$E: $(SRCDIR)\makeheaders.c
1315 $(XBCC) -o$@ $**
1316
1317 mkindex$E: $(SRCDIR)\mkindex.c
1318 $(XBCC) -o$@ $**
1319
1320 mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
1321 $(XBCC) -o$@ $**
1322
1323 mkversion$E: $(SRCDIR)\mkversion.c
1324 $(XBCC) -o$@ $**
1325
1326 codecheck1$E: $(SRCDIR)\codecheck1.c
1327 $(XBCC) -o$@ $**
1328
1329 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
1330 $(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
1331
1332 $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
@@ -1829,26 +1829,26 @@
1829 writeln {
1830 $(OX):
1831 @-mkdir $@
1832
1833 translate$E: $(SRCDIR)\translate.c
1834 $(XBCC) $**
1835
1836 makeheaders$E: $(SRCDIR)\makeheaders.c
1837 $(XBCC) $**
1838
1839 mkindex$E: $(SRCDIR)\mkindex.c
1840 $(XBCC) $**
1841
1842 mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
1843 $(XBCC) $**
1844
1845 mkversion$E: $(SRCDIR)\mkversion.c
1846 $(XBCC) $**
1847
1848 codecheck1$E: $(SRCDIR)\codecheck1.c
1849 $(XBCC) $**
1850
1851 !if $(USE_SEE)!=0
1852 SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1853 !else
1854 SQLITE3_SHELL_SRC = $(SRCDIR)\shell.c
1855
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1307,26 +1307,26 @@
1307 writeln "\t+echo. >> \$@"
1308 writeln "\t+echo fossil >> \$@"
1309
1310 writeln {
1311 translate$E: $(SRCDIR)\translate.c
1312 $(BCC) -o$@ $**
1313
1314 makeheaders$E: $(SRCDIR)\makeheaders.c
1315 $(BCC) -o$@ $**
1316
1317 mkindex$E: $(SRCDIR)\mkindex.c
1318 $(BCC) -o$@ $**
1319
1320 mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
1321 $(BCC) -o$@ $**
1322
1323 mkversion$E: $(SRCDIR)\mkversion.c
1324 $(BCC) -o$@ $**
1325
1326 codecheck1$E: $(SRCDIR)\codecheck1.c
1327 $(BCC) -o$@ $**
1328
1329 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
1330 $(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
1331
1332 $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
@@ -1829,26 +1829,26 @@
1829 writeln {
1830 $(OX):
1831 @-mkdir $@
1832
1833 translate$E: $(SRCDIR)\translate.c
1834 $(BCC) $**
1835
1836 makeheaders$E: $(SRCDIR)\makeheaders.c
1837 $(BCC) $**
1838
1839 mkindex$E: $(SRCDIR)\mkindex.c
1840 $(BCC) $**
1841
1842 mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
1843 $(BCC) $**
1844
1845 mkversion$E: $(SRCDIR)\mkversion.c
1846 $(BCC) $**
1847
1848 codecheck1$E: $(SRCDIR)\codecheck1.c
1849 $(BCC) $**
1850
1851 !if $(USE_SEE)!=0
1852 SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1853 !else
1854 SQLITE3_SHELL_SRC = $(SRCDIR)\shell.c
1855

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button