Fossil SCM
Make it easier to override the final built executable name when using MSVC.
Commit
b2993e5a66d88cd533ebc432125a9d95a0a333988c744c0bb3ad5100468383a8
Parent
485eda766431c97…
2 files changed
+7
-3
+7
-3
+7
-3
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -1831,13 +1831,17 @@ | ||
| 1831 | 1831 | writeln -nonewline " " |
| 1832 | 1832 | writeln "\$(OX)\\miniz\$O \\"; incr i |
| 1833 | 1833 | writeln "!endif" |
| 1834 | 1834 | writeln -nonewline " \$(OX)\\fossil.res\n\n" |
| 1835 | 1835 | writeln [string map [list <<<NEXT_LINE>>> \\] { |
| 1836 | -APPNAME = $(OX)\fossil$(E) | |
| 1837 | -PDBNAME = $(OX)\fossil$(P) | |
| 1838 | -APPTARGETS = | |
| 1836 | +!ifndef BASEAPPNAME | |
| 1837 | +BASEAPPNAME = fossil | |
| 1838 | +!endif | |
| 1839 | + | |
| 1840 | +APPNAME = $(OX)\$(BASEAPPNAME)$(E) | |
| 1841 | +PDBNAME = $(OX)\$(BASEAPPNAME)$(P) | |
| 1842 | +APPTARGETS = | |
| 1839 | 1843 | |
| 1840 | 1844 | all: $(OX) $(APPNAME) |
| 1841 | 1845 | |
| 1842 | 1846 | zlib: |
| 1843 | 1847 | @echo Building zlib from "$(ZLIBDIR)"... |
| 1844 | 1848 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1831,13 +1831,17 @@ | |
| 1831 | writeln -nonewline " " |
| 1832 | writeln "\$(OX)\\miniz\$O \\"; incr i |
| 1833 | writeln "!endif" |
| 1834 | writeln -nonewline " \$(OX)\\fossil.res\n\n" |
| 1835 | writeln [string map [list <<<NEXT_LINE>>> \\] { |
| 1836 | APPNAME = $(OX)\fossil$(E) |
| 1837 | PDBNAME = $(OX)\fossil$(P) |
| 1838 | APPTARGETS = |
| 1839 | |
| 1840 | all: $(OX) $(APPNAME) |
| 1841 | |
| 1842 | zlib: |
| 1843 | @echo Building zlib from "$(ZLIBDIR)"... |
| 1844 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1831,13 +1831,17 @@ | |
| 1831 | writeln -nonewline " " |
| 1832 | writeln "\$(OX)\\miniz\$O \\"; incr i |
| 1833 | writeln "!endif" |
| 1834 | writeln -nonewline " \$(OX)\\fossil.res\n\n" |
| 1835 | writeln [string map [list <<<NEXT_LINE>>> \\] { |
| 1836 | !ifndef BASEAPPNAME |
| 1837 | BASEAPPNAME = fossil |
| 1838 | !endif |
| 1839 | |
| 1840 | APPNAME = $(OX)\$(BASEAPPNAME)$(E) |
| 1841 | PDBNAME = $(OX)\$(BASEAPPNAME)$(P) |
| 1842 | APPTARGETS = |
| 1843 | |
| 1844 | all: $(OX) $(APPNAME) |
| 1845 | |
| 1846 | zlib: |
| 1847 | @echo Building zlib from "$(ZLIBDIR)"... |
| 1848 |
+7
-3
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -733,13 +733,17 @@ | ||
| 733 | 733 | $(OX)\miniz$O \ |
| 734 | 734 | !endif |
| 735 | 735 | $(OX)\fossil.res |
| 736 | 736 | |
| 737 | 737 | |
| 738 | -APPNAME = $(OX)\fossil$(E) | |
| 739 | -PDBNAME = $(OX)\fossil$(P) | |
| 740 | -APPTARGETS = | |
| 738 | +!ifndef BASEAPPNAME | |
| 739 | +BASEAPPNAME = fossil | |
| 740 | +!endif | |
| 741 | + | |
| 742 | +APPNAME = $(OX)\$(BASEAPPNAME)$(E) | |
| 743 | +PDBNAME = $(OX)\$(BASEAPPNAME)$(P) | |
| 744 | +APPTARGETS = | |
| 741 | 745 | |
| 742 | 746 | all: $(OX) $(APPNAME) |
| 743 | 747 | |
| 744 | 748 | zlib: |
| 745 | 749 | @echo Building zlib from "$(ZLIBDIR)"... |
| 746 | 750 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -733,13 +733,17 @@ | |
| 733 | $(OX)\miniz$O \ |
| 734 | !endif |
| 735 | $(OX)\fossil.res |
| 736 | |
| 737 | |
| 738 | APPNAME = $(OX)\fossil$(E) |
| 739 | PDBNAME = $(OX)\fossil$(P) |
| 740 | APPTARGETS = |
| 741 | |
| 742 | all: $(OX) $(APPNAME) |
| 743 | |
| 744 | zlib: |
| 745 | @echo Building zlib from "$(ZLIBDIR)"... |
| 746 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -733,13 +733,17 @@ | |
| 733 | $(OX)\miniz$O \ |
| 734 | !endif |
| 735 | $(OX)\fossil.res |
| 736 | |
| 737 | |
| 738 | !ifndef BASEAPPNAME |
| 739 | BASEAPPNAME = fossil |
| 740 | !endif |
| 741 | |
| 742 | APPNAME = $(OX)\$(BASEAPPNAME)$(E) |
| 743 | PDBNAME = $(OX)\$(BASEAPPNAME)$(P) |
| 744 | APPTARGETS = |
| 745 | |
| 746 | all: $(OX) $(APPNAME) |
| 747 | |
| 748 | zlib: |
| 749 | @echo Building zlib from "$(ZLIBDIR)"... |
| 750 |