Fossil SCM
Regenerate the MinGW makefile, since it apparently does use XBCC. Also, sync up the custom MinGW makefile with it.
Commit
ce6980481e4cb06a2e9eb4d34313523825b2d0f9
Parent
f366e52f63f4fb7…
2 files changed
+7
-6
+7
-6
+7
-6
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -418,10 +418,11 @@ | ||
| 418 | 418 | -include config.w32 |
| 419 | 419 | |
| 420 | 420 | # STOP HERE |
| 421 | 421 | # You should not need to change anything below this line |
| 422 | 422 | #-------------------------------------------------------- |
| 423 | +XBCC = $(BCC) $(CFLAGS) | |
| 423 | 424 | XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR) |
| 424 | 425 | |
| 425 | 426 | SRC = \ |
| 426 | 427 | $(SRCDIR)/add.c \ |
| 427 | 428 | $(SRCDIR)/allrepo.c \ |
| @@ -916,26 +917,26 @@ | ||
| 916 | 917 | else |
| 917 | 918 | $(MKDIR) $(OBJDIR) |
| 918 | 919 | endif |
| 919 | 920 | |
| 920 | 921 | $(TRANSLATE): $(SRCDIR)/translate.c |
| 921 | - $(BCC) -o $@ $(SRCDIR)/translate.c | |
| 922 | + $(XBCC) -o $@ $(SRCDIR)/translate.c | |
| 922 | 923 | |
| 923 | 924 | $(MAKEHEADERS): $(SRCDIR)/makeheaders.c |
| 924 | - $(BCC) -o $@ $(SRCDIR)/makeheaders.c | |
| 925 | + $(XBCC) -o $@ $(SRCDIR)/makeheaders.c | |
| 925 | 926 | |
| 926 | 927 | $(MKINDEX): $(SRCDIR)/mkindex.c |
| 927 | - $(BCC) -o $@ $(SRCDIR)/mkindex.c | |
| 928 | + $(XBCC) -o $@ $(SRCDIR)/mkindex.c | |
| 928 | 929 | |
| 929 | 930 | $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c |
| 930 | - $(BCC) -o $@ $(SRCDIR)/mkbuiltin.c | |
| 931 | + $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c | |
| 931 | 932 | |
| 932 | 933 | $(MKVERSION): $(SRCDIR)/mkversion.c |
| 933 | - $(BCC) -o $@ $(SRCDIR)/mkversion.c | |
| 934 | + $(XBCC) -o $@ $(SRCDIR)/mkversion.c | |
| 934 | 935 | |
| 935 | 936 | $(CODECHECK1): $(SRCDIR)/codecheck1.c |
| 936 | - $(BCC) -o $@ $(SRCDIR)/codecheck1.c | |
| 937 | + $(XBCC) -o $@ $(SRCDIR)/codecheck1.c | |
| 937 | 938 | |
| 938 | 939 | # WARNING. DANGER. Running the test suite modifies the repository the |
| 939 | 940 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 940 | 941 | # the repository after running the tests. |
| 941 | 942 | test: $(OBJDIR) $(APPNAME) |
| 942 | 943 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -418,10 +418,11 @@ | |
| 418 | -include config.w32 |
| 419 | |
| 420 | # STOP HERE |
| 421 | # You should not need to change anything below this line |
| 422 | #-------------------------------------------------------- |
| 423 | XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR) |
| 424 | |
| 425 | SRC = \ |
| 426 | $(SRCDIR)/add.c \ |
| 427 | $(SRCDIR)/allrepo.c \ |
| @@ -916,26 +917,26 @@ | |
| 916 | else |
| 917 | $(MKDIR) $(OBJDIR) |
| 918 | endif |
| 919 | |
| 920 | $(TRANSLATE): $(SRCDIR)/translate.c |
| 921 | $(BCC) -o $@ $(SRCDIR)/translate.c |
| 922 | |
| 923 | $(MAKEHEADERS): $(SRCDIR)/makeheaders.c |
| 924 | $(BCC) -o $@ $(SRCDIR)/makeheaders.c |
| 925 | |
| 926 | $(MKINDEX): $(SRCDIR)/mkindex.c |
| 927 | $(BCC) -o $@ $(SRCDIR)/mkindex.c |
| 928 | |
| 929 | $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c |
| 930 | $(BCC) -o $@ $(SRCDIR)/mkbuiltin.c |
| 931 | |
| 932 | $(MKVERSION): $(SRCDIR)/mkversion.c |
| 933 | $(BCC) -o $@ $(SRCDIR)/mkversion.c |
| 934 | |
| 935 | $(CODECHECK1): $(SRCDIR)/codecheck1.c |
| 936 | $(BCC) -o $@ $(SRCDIR)/codecheck1.c |
| 937 | |
| 938 | # WARNING. DANGER. Running the test suite modifies the repository the |
| 939 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 940 | # the repository after running the tests. |
| 941 | test: $(OBJDIR) $(APPNAME) |
| 942 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -418,10 +418,11 @@ | |
| 418 | -include config.w32 |
| 419 | |
| 420 | # STOP HERE |
| 421 | # You should not need to change anything below this line |
| 422 | #-------------------------------------------------------- |
| 423 | XBCC = $(BCC) $(CFLAGS) |
| 424 | XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR) |
| 425 | |
| 426 | SRC = \ |
| 427 | $(SRCDIR)/add.c \ |
| 428 | $(SRCDIR)/allrepo.c \ |
| @@ -916,26 +917,26 @@ | |
| 917 | else |
| 918 | $(MKDIR) $(OBJDIR) |
| 919 | endif |
| 920 | |
| 921 | $(TRANSLATE): $(SRCDIR)/translate.c |
| 922 | $(XBCC) -o $@ $(SRCDIR)/translate.c |
| 923 | |
| 924 | $(MAKEHEADERS): $(SRCDIR)/makeheaders.c |
| 925 | $(XBCC) -o $@ $(SRCDIR)/makeheaders.c |
| 926 | |
| 927 | $(MKINDEX): $(SRCDIR)/mkindex.c |
| 928 | $(XBCC) -o $@ $(SRCDIR)/mkindex.c |
| 929 | |
| 930 | $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c |
| 931 | $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c |
| 932 | |
| 933 | $(MKVERSION): $(SRCDIR)/mkversion.c |
| 934 | $(XBCC) -o $@ $(SRCDIR)/mkversion.c |
| 935 | |
| 936 | $(CODECHECK1): $(SRCDIR)/codecheck1.c |
| 937 | $(XBCC) -o $@ $(SRCDIR)/codecheck1.c |
| 938 | |
| 939 | # WARNING. DANGER. Running the test suite modifies the repository the |
| 940 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 941 | # the repository after running the tests. |
| 942 | test: $(OBJDIR) $(APPNAME) |
| 943 |
+7
-6
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -418,10 +418,11 @@ | ||
| 418 | 418 | -include config.w32 |
| 419 | 419 | |
| 420 | 420 | # STOP HERE |
| 421 | 421 | # You should not need to change anything below this line |
| 422 | 422 | #-------------------------------------------------------- |
| 423 | +XBCC = $(BCC) $(CFLAGS) | |
| 423 | 424 | XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR) |
| 424 | 425 | |
| 425 | 426 | SRC = \ |
| 426 | 427 | $(SRCDIR)/add.c \ |
| 427 | 428 | $(SRCDIR)/allrepo.c \ |
| @@ -916,26 +917,26 @@ | ||
| 916 | 917 | else |
| 917 | 918 | $(MKDIR) $(OBJDIR) |
| 918 | 919 | endif |
| 919 | 920 | |
| 920 | 921 | $(TRANSLATE): $(SRCDIR)/translate.c |
| 921 | - $(BCC) -o $@ $(SRCDIR)/translate.c | |
| 922 | + $(XBCC) -o $@ $(SRCDIR)/translate.c | |
| 922 | 923 | |
| 923 | 924 | $(MAKEHEADERS): $(SRCDIR)/makeheaders.c |
| 924 | - $(BCC) -o $@ $(SRCDIR)/makeheaders.c | |
| 925 | + $(XBCC) -o $@ $(SRCDIR)/makeheaders.c | |
| 925 | 926 | |
| 926 | 927 | $(MKINDEX): $(SRCDIR)/mkindex.c |
| 927 | - $(BCC) -o $@ $(SRCDIR)/mkindex.c | |
| 928 | + $(XBCC) -o $@ $(SRCDIR)/mkindex.c | |
| 928 | 929 | |
| 929 | 930 | $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c |
| 930 | - $(BCC) -o $@ $(SRCDIR)/mkbuiltin.c | |
| 931 | + $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c | |
| 931 | 932 | |
| 932 | 933 | $(MKVERSION): $(SRCDIR)/mkversion.c |
| 933 | - $(BCC) -o $@ $(SRCDIR)/mkversion.c | |
| 934 | + $(XBCC) -o $@ $(SRCDIR)/mkversion.c | |
| 934 | 935 | |
| 935 | 936 | $(CODECHECK1): $(SRCDIR)/codecheck1.c |
| 936 | - $(BCC) -o $@ $(SRCDIR)/codecheck1.c | |
| 937 | + $(XBCC) -o $@ $(SRCDIR)/codecheck1.c | |
| 937 | 938 | |
| 938 | 939 | # WARNING. DANGER. Running the test suite modifies the repository the |
| 939 | 940 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 940 | 941 | # the repository after running the tests. |
| 941 | 942 | test: $(OBJDIR) $(APPNAME) |
| 942 | 943 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -418,10 +418,11 @@ | |
| 418 | -include config.w32 |
| 419 | |
| 420 | # STOP HERE |
| 421 | # You should not need to change anything below this line |
| 422 | #-------------------------------------------------------- |
| 423 | XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR) |
| 424 | |
| 425 | SRC = \ |
| 426 | $(SRCDIR)/add.c \ |
| 427 | $(SRCDIR)/allrepo.c \ |
| @@ -916,26 +917,26 @@ | |
| 916 | else |
| 917 | $(MKDIR) $(OBJDIR) |
| 918 | endif |
| 919 | |
| 920 | $(TRANSLATE): $(SRCDIR)/translate.c |
| 921 | $(BCC) -o $@ $(SRCDIR)/translate.c |
| 922 | |
| 923 | $(MAKEHEADERS): $(SRCDIR)/makeheaders.c |
| 924 | $(BCC) -o $@ $(SRCDIR)/makeheaders.c |
| 925 | |
| 926 | $(MKINDEX): $(SRCDIR)/mkindex.c |
| 927 | $(BCC) -o $@ $(SRCDIR)/mkindex.c |
| 928 | |
| 929 | $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c |
| 930 | $(BCC) -o $@ $(SRCDIR)/mkbuiltin.c |
| 931 | |
| 932 | $(MKVERSION): $(SRCDIR)/mkversion.c |
| 933 | $(BCC) -o $@ $(SRCDIR)/mkversion.c |
| 934 | |
| 935 | $(CODECHECK1): $(SRCDIR)/codecheck1.c |
| 936 | $(BCC) -o $@ $(SRCDIR)/codecheck1.c |
| 937 | |
| 938 | # WARNING. DANGER. Running the test suite modifies the repository the |
| 939 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 940 | # the repository after running the tests. |
| 941 | test: $(OBJDIR) $(APPNAME) |
| 942 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -418,10 +418,11 @@ | |
| 418 | -include config.w32 |
| 419 | |
| 420 | # STOP HERE |
| 421 | # You should not need to change anything below this line |
| 422 | #-------------------------------------------------------- |
| 423 | XBCC = $(BCC) $(CFLAGS) |
| 424 | XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR) |
| 425 | |
| 426 | SRC = \ |
| 427 | $(SRCDIR)/add.c \ |
| 428 | $(SRCDIR)/allrepo.c \ |
| @@ -916,26 +917,26 @@ | |
| 917 | else |
| 918 | $(MKDIR) $(OBJDIR) |
| 919 | endif |
| 920 | |
| 921 | $(TRANSLATE): $(SRCDIR)/translate.c |
| 922 | $(XBCC) -o $@ $(SRCDIR)/translate.c |
| 923 | |
| 924 | $(MAKEHEADERS): $(SRCDIR)/makeheaders.c |
| 925 | $(XBCC) -o $@ $(SRCDIR)/makeheaders.c |
| 926 | |
| 927 | $(MKINDEX): $(SRCDIR)/mkindex.c |
| 928 | $(XBCC) -o $@ $(SRCDIR)/mkindex.c |
| 929 | |
| 930 | $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c |
| 931 | $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c |
| 932 | |
| 933 | $(MKVERSION): $(SRCDIR)/mkversion.c |
| 934 | $(XBCC) -o $@ $(SRCDIR)/mkversion.c |
| 935 | |
| 936 | $(CODECHECK1): $(SRCDIR)/codecheck1.c |
| 937 | $(XBCC) -o $@ $(SRCDIR)/codecheck1.c |
| 938 | |
| 939 | # WARNING. DANGER. Running the test suite modifies the repository the |
| 940 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 941 | # the repository after running the tests. |
| 942 | test: $(OBJDIR) $(APPNAME) |
| 943 |