Fossil SCM
Minor improvements to command macros.
Commit
b463e469951507d5a6c8de79cf7193649d5d0a39
Parent
50cb0fe3c70922a…
2 files changed
+3
-2
+3
-2
+3
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -1490,11 +1490,12 @@ | ||
| 1490 | 1490 | CFLAGS = $(CFLAGS) $(CRTFLAGS) /O2 |
| 1491 | 1491 | !endif |
| 1492 | 1492 | |
| 1493 | 1493 | BCC = $(CC) $(CFLAGS) |
| 1494 | 1494 | TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL) |
| 1495 | -RCC = rc /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL) | |
| 1495 | +RCC = $(RC) /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL) | |
| 1496 | +MTC = mt | |
| 1496 | 1497 | LIBS = ws2_32.lib advapi32.lib |
| 1497 | 1498 | LIBDIR = |
| 1498 | 1499 | |
| 1499 | 1500 | !ifdef FOSSIL_DYNAMIC_BUILD |
| 1500 | 1501 | TCC = $(TCC) /DFOSSIL_DYNAMIC_BUILD=1 |
| @@ -1644,11 +1645,11 @@ | ||
| 1644 | 1645 | $(APPNAME) : $(APPTARGETS) translate$E mkindex$E codecheck1$E headers $(OBJ) $(OX)\linkopts |
| 1645 | 1646 | cd $(OX) |
| 1646 | 1647 | codecheck1$E $(SRC) |
| 1647 | 1648 | link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts |
| 1648 | 1649 | if exist [email protected] <<<NEXT_LINE>>> |
| 1649 | - mt -nologo -manifest [email protected] -outputresource:$@;1 | |
| 1650 | + $(MTC) -nologo -manifest [email protected] -outputresource:$@;1 | |
| 1650 | 1651 | |
| 1651 | 1652 | $(OX)\linkopts: $B\win\Makefile.msc}] |
| 1652 | 1653 | set redir {>} |
| 1653 | 1654 | foreach s [lsort [concat $src $AdditionalObj]] { |
| 1654 | 1655 | writeln "\techo \$(OX)\\$s.obj $redir \$@" |
| 1655 | 1656 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1490,11 +1490,12 @@ | |
| 1490 | CFLAGS = $(CFLAGS) $(CRTFLAGS) /O2 |
| 1491 | !endif |
| 1492 | |
| 1493 | BCC = $(CC) $(CFLAGS) |
| 1494 | TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL) |
| 1495 | RCC = rc /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL) |
| 1496 | LIBS = ws2_32.lib advapi32.lib |
| 1497 | LIBDIR = |
| 1498 | |
| 1499 | !ifdef FOSSIL_DYNAMIC_BUILD |
| 1500 | TCC = $(TCC) /DFOSSIL_DYNAMIC_BUILD=1 |
| @@ -1644,11 +1645,11 @@ | |
| 1644 | $(APPNAME) : $(APPTARGETS) translate$E mkindex$E codecheck1$E headers $(OBJ) $(OX)\linkopts |
| 1645 | cd $(OX) |
| 1646 | codecheck1$E $(SRC) |
| 1647 | link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts |
| 1648 | if exist [email protected] <<<NEXT_LINE>>> |
| 1649 | mt -nologo -manifest [email protected] -outputresource:$@;1 |
| 1650 | |
| 1651 | $(OX)\linkopts: $B\win\Makefile.msc}] |
| 1652 | set redir {>} |
| 1653 | foreach s [lsort [concat $src $AdditionalObj]] { |
| 1654 | writeln "\techo \$(OX)\\$s.obj $redir \$@" |
| 1655 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1490,11 +1490,12 @@ | |
| 1490 | CFLAGS = $(CFLAGS) $(CRTFLAGS) /O2 |
| 1491 | !endif |
| 1492 | |
| 1493 | BCC = $(CC) $(CFLAGS) |
| 1494 | TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL) |
| 1495 | RCC = $(RC) /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL) |
| 1496 | MTC = mt |
| 1497 | LIBS = ws2_32.lib advapi32.lib |
| 1498 | LIBDIR = |
| 1499 | |
| 1500 | !ifdef FOSSIL_DYNAMIC_BUILD |
| 1501 | TCC = $(TCC) /DFOSSIL_DYNAMIC_BUILD=1 |
| @@ -1644,11 +1645,11 @@ | |
| 1645 | $(APPNAME) : $(APPTARGETS) translate$E mkindex$E codecheck1$E headers $(OBJ) $(OX)\linkopts |
| 1646 | cd $(OX) |
| 1647 | codecheck1$E $(SRC) |
| 1648 | link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts |
| 1649 | if exist [email protected] <<<NEXT_LINE>>> |
| 1650 | $(MTC) -nologo -manifest [email protected] -outputresource:$@;1 |
| 1651 | |
| 1652 | $(OX)\linkopts: $B\win\Makefile.msc}] |
| 1653 | set redir {>} |
| 1654 | foreach s [lsort [concat $src $AdditionalObj]] { |
| 1655 | writeln "\techo \$(OX)\\$s.obj $redir \$@" |
| 1656 |
+3
-2
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -209,11 +209,12 @@ | ||
| 209 | 209 | CFLAGS = $(CFLAGS) $(CRTFLAGS) /O2 |
| 210 | 210 | !endif |
| 211 | 211 | |
| 212 | 212 | BCC = $(CC) $(CFLAGS) |
| 213 | 213 | TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL) |
| 214 | -RCC = rc /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL) | |
| 214 | +RCC = $(RC) /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL) | |
| 215 | +MTC = mt | |
| 215 | 216 | LIBS = ws2_32.lib advapi32.lib |
| 216 | 217 | LIBDIR = |
| 217 | 218 | |
| 218 | 219 | !ifdef FOSSIL_DYNAMIC_BUILD |
| 219 | 220 | TCC = $(TCC) /DFOSSIL_DYNAMIC_BUILD=1 |
| @@ -638,11 +639,11 @@ | ||
| 638 | 639 | $(APPNAME) : $(APPTARGETS) translate$E mkindex$E codecheck1$E headers $(OBJ) $(OX)\linkopts |
| 639 | 640 | cd $(OX) |
| 640 | 641 | codecheck1$E $(SRC) |
| 641 | 642 | link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts |
| 642 | 643 | if exist [email protected] \ |
| 643 | - mt -nologo -manifest [email protected] -outputresource:$@;1 | |
| 644 | + $(MTC) -nologo -manifest [email protected] -outputresource:$@;1 | |
| 644 | 645 | |
| 645 | 646 | $(OX)\linkopts: $B\win\Makefile.msc |
| 646 | 647 | echo $(OX)\add.obj > $@ |
| 647 | 648 | echo $(OX)\allrepo.obj >> $@ |
| 648 | 649 | echo $(OX)\attach.obj >> $@ |
| 649 | 650 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -209,11 +209,12 @@ | |
| 209 | CFLAGS = $(CFLAGS) $(CRTFLAGS) /O2 |
| 210 | !endif |
| 211 | |
| 212 | BCC = $(CC) $(CFLAGS) |
| 213 | TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL) |
| 214 | RCC = rc /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL) |
| 215 | LIBS = ws2_32.lib advapi32.lib |
| 216 | LIBDIR = |
| 217 | |
| 218 | !ifdef FOSSIL_DYNAMIC_BUILD |
| 219 | TCC = $(TCC) /DFOSSIL_DYNAMIC_BUILD=1 |
| @@ -638,11 +639,11 @@ | |
| 638 | $(APPNAME) : $(APPTARGETS) translate$E mkindex$E codecheck1$E headers $(OBJ) $(OX)\linkopts |
| 639 | cd $(OX) |
| 640 | codecheck1$E $(SRC) |
| 641 | link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts |
| 642 | if exist [email protected] \ |
| 643 | mt -nologo -manifest [email protected] -outputresource:$@;1 |
| 644 | |
| 645 | $(OX)\linkopts: $B\win\Makefile.msc |
| 646 | echo $(OX)\add.obj > $@ |
| 647 | echo $(OX)\allrepo.obj >> $@ |
| 648 | echo $(OX)\attach.obj >> $@ |
| 649 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -209,11 +209,12 @@ | |
| 209 | CFLAGS = $(CFLAGS) $(CRTFLAGS) /O2 |
| 210 | !endif |
| 211 | |
| 212 | BCC = $(CC) $(CFLAGS) |
| 213 | TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL) |
| 214 | RCC = $(RC) /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL) |
| 215 | MTC = mt |
| 216 | LIBS = ws2_32.lib advapi32.lib |
| 217 | LIBDIR = |
| 218 | |
| 219 | !ifdef FOSSIL_DYNAMIC_BUILD |
| 220 | TCC = $(TCC) /DFOSSIL_DYNAMIC_BUILD=1 |
| @@ -638,11 +639,11 @@ | |
| 639 | $(APPNAME) : $(APPTARGETS) translate$E mkindex$E codecheck1$E headers $(OBJ) $(OX)\linkopts |
| 640 | cd $(OX) |
| 641 | codecheck1$E $(SRC) |
| 642 | link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts |
| 643 | if exist [email protected] \ |
| 644 | $(MTC) -nologo -manifest [email protected] -outputresource:$@;1 |
| 645 | |
| 646 | $(OX)\linkopts: $B\win\Makefile.msc |
| 647 | echo $(OX)\add.obj > $@ |
| 648 | echo $(OX)\allrepo.obj >> $@ |
| 649 | echo $(OX)\attach.obj >> $@ |
| 650 |