Fossil SCM
Fix handling of the 'fossil.exe.manifest' file by the MSVC makefile.
Commit
6acb039c8149a0710fa7e917af88237c4006f17a852a4936993e3c414fce5242
Parent
c89a5a3ad2f009a…
2 files changed
+6
-11
+6
-11
+6
-11
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -1821,23 +1821,22 @@ | ||
| 1821 | 1821 | BASEAPPNAME = fossil |
| 1822 | 1822 | !endif |
| 1823 | 1823 | |
| 1824 | 1824 | APPNAME = $(OX)\$(BASEAPPNAME)$(E) |
| 1825 | 1825 | PDBNAME = $(OX)\$(BASEAPPNAME)$(P) |
| 1826 | -APPMANIFEST = $(APPNAME).manifest | |
| 1827 | 1826 | APPTARGETS = |
| 1828 | 1827 | |
| 1829 | 1828 | all: "$(OX)" "$(APPNAME)" |
| 1830 | 1829 | |
| 1831 | 1830 | $(BASEAPPNAME): "$(APPNAME)" |
| 1832 | 1831 | |
| 1833 | 1832 | $(BASEAPPNAME)$(E): "$(APPNAME)" |
| 1834 | 1833 | |
| 1835 | 1834 | install: "$(APPNAME)" |
| 1836 | - echo F | xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"\* | |
| 1835 | + echo F | xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"\* | |
| 1837 | 1836 | !if $(DEBUG)!=0 |
| 1838 | - echo F | xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"\* | |
| 1837 | + echo F | xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"\* | |
| 1839 | 1838 | !endif |
| 1840 | 1839 | |
| 1841 | 1840 | $(OX): |
| 1842 | 1841 | @-mkdir $@ |
| 1843 | 1842 | |
| @@ -1881,15 +1880,15 @@ | ||
| 1881 | 1880 | !if $(FOSSIL_BUILD_SSL)!=0 |
| 1882 | 1881 | APPTARGETS = $(APPTARGETS) openssl |
| 1883 | 1882 | !endif |
| 1884 | 1883 | !endif |
| 1885 | 1884 | |
| 1886 | -"$(APPNAME)" : "$(APPMANIFEST)" $(APPTARGETS) "$(OBJDIR)\translate$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\codecheck1$E" "$(OX)\headers" $(OBJ) "$(OX)\linkopts" | |
| 1885 | +"$(APPNAME)" : $(APPTARGETS) "$(OBJDIR)\translate$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\codecheck1$E" "$(OX)\headers" $(OBJ) "$(OX)\linkopts" | |
| 1887 | 1886 | "$(OBJDIR)\codecheck1$E" $(SRC) |
| 1888 | 1887 | link $(LDFLAGS) /OUT:$@ /PDB:$(@D)\ $(LIBDIR) Wsetargv.obj "$(OX)\fossil.res" @"$(OX)\linkopts" |
| 1889 | - if exist "$(APPMANIFEST)" <<<NEXT_LINE>>> | |
| 1890 | - $(MTC) -nologo -manifest "$(APPMANIFEST)" -outputresource:$@;1 | |
| 1888 | + if exist "$(B)\win\fossil.exe.manifest" <<<NEXT_LINE>>> | |
| 1889 | + $(MTC) -nologo -manifest "$(B)\win\fossil.exe.manifest" -outputresource:$@;1 | |
| 1891 | 1890 | |
| 1892 | 1891 | "$(OX)\linkopts": "$(B)\win\Makefile.msc"}] |
| 1893 | 1892 | set redir {>} |
| 1894 | 1893 | foreach s [lsort [concat $src $AdditionalObj]] { |
| 1895 | 1894 | writeln "\techo \"\$(OX)\\$s.obj\" $redir \$@" |
| @@ -1979,11 +1978,10 @@ | ||
| 1979 | 1978 | -del "$(OX)\vc*.pdb" 2>NUL |
| 1980 | 1979 | |
| 1981 | 1980 | clean: cleanx |
| 1982 | 1981 | -del "$(APPNAME)" 2>NUL |
| 1983 | 1982 | -del "$(PDBNAME)" 2>NUL |
| 1984 | - -del "$(APPMANIFEST)" 2>NUL | |
| 1985 | 1983 | -del "$(OBJDIR)\translate$E" 2>NUL |
| 1986 | 1984 | -del "$(OBJDIR)\translate$P" 2>NUL |
| 1987 | 1985 | -del "$(OBJDIR)\mkindex$E" 2>NUL |
| 1988 | 1986 | -del "$(OBJDIR)\mkindex$P" 2>NUL |
| 1989 | 1987 | -del "$(OBJDIR)\makeheaders$E" 2>NUL |
| @@ -2030,14 +2028,11 @@ | ||
| 2030 | 2028 | writeln "\"\$(OX)\\${s}_.c\" : \"\$(SRCDIR)\\$s.c\"" |
| 2031 | 2029 | writeln "\t\"\$(OBJDIR)\\translate\$E\" \$** > \$@\n" |
| 2032 | 2030 | } |
| 2033 | 2031 | |
| 2034 | 2032 | writeln "\"\$(OX)\\fossil.res\" : \"\$(B)\\win\\fossil.rc\"" |
| 2035 | -writeln "\t\$(RCC) /fo \$@ \$**\n" | |
| 2036 | - | |
| 2037 | -writeln "\"\$(OX)\\fossil.exe.manifest\" : \"\$(B)\\win\\fossil.exe.manifest\"" | |
| 2038 | -writeln "\tcopy /Y \$** \$@ \n" | |
| 2033 | +writeln "\t\$(RCC) /fo \$@ \$**\n" | |
| 2039 | 2034 | |
| 2040 | 2035 | writeln "\"\$(OX)\\headers\": \"\$(OBJDIR)\\makeheaders\$E\" \"\$(OX)\\page_index.h\" \"\$(OX)\\builtin_data.h\" \"\$(OX)\\default_css.h\" \"\$(OX)\\VERSION.h\"" |
| 2041 | 2036 | writeln -nonewline "\t\"\$(OBJDIR)\\makeheaders\$E\" " |
| 2042 | 2037 | set i 0 |
| 2043 | 2038 | foreach s [lsort $src] { |
| 2044 | 2039 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1821,23 +1821,22 @@ | |
| 1821 | BASEAPPNAME = fossil |
| 1822 | !endif |
| 1823 | |
| 1824 | APPNAME = $(OX)\$(BASEAPPNAME)$(E) |
| 1825 | PDBNAME = $(OX)\$(BASEAPPNAME)$(P) |
| 1826 | APPMANIFEST = $(APPNAME).manifest |
| 1827 | APPTARGETS = |
| 1828 | |
| 1829 | all: "$(OX)" "$(APPNAME)" |
| 1830 | |
| 1831 | $(BASEAPPNAME): "$(APPNAME)" |
| 1832 | |
| 1833 | $(BASEAPPNAME)$(E): "$(APPNAME)" |
| 1834 | |
| 1835 | install: "$(APPNAME)" |
| 1836 | echo F | xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"\* |
| 1837 | !if $(DEBUG)!=0 |
| 1838 | echo F | xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"\* |
| 1839 | !endif |
| 1840 | |
| 1841 | $(OX): |
| 1842 | @-mkdir $@ |
| 1843 | |
| @@ -1881,15 +1880,15 @@ | |
| 1881 | !if $(FOSSIL_BUILD_SSL)!=0 |
| 1882 | APPTARGETS = $(APPTARGETS) openssl |
| 1883 | !endif |
| 1884 | !endif |
| 1885 | |
| 1886 | "$(APPNAME)" : "$(APPMANIFEST)" $(APPTARGETS) "$(OBJDIR)\translate$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\codecheck1$E" "$(OX)\headers" $(OBJ) "$(OX)\linkopts" |
| 1887 | "$(OBJDIR)\codecheck1$E" $(SRC) |
| 1888 | link $(LDFLAGS) /OUT:$@ /PDB:$(@D)\ $(LIBDIR) Wsetargv.obj "$(OX)\fossil.res" @"$(OX)\linkopts" |
| 1889 | if exist "$(APPMANIFEST)" <<<NEXT_LINE>>> |
| 1890 | $(MTC) -nologo -manifest "$(APPMANIFEST)" -outputresource:$@;1 |
| 1891 | |
| 1892 | "$(OX)\linkopts": "$(B)\win\Makefile.msc"}] |
| 1893 | set redir {>} |
| 1894 | foreach s [lsort [concat $src $AdditionalObj]] { |
| 1895 | writeln "\techo \"\$(OX)\\$s.obj\" $redir \$@" |
| @@ -1979,11 +1978,10 @@ | |
| 1979 | -del "$(OX)\vc*.pdb" 2>NUL |
| 1980 | |
| 1981 | clean: cleanx |
| 1982 | -del "$(APPNAME)" 2>NUL |
| 1983 | -del "$(PDBNAME)" 2>NUL |
| 1984 | -del "$(APPMANIFEST)" 2>NUL |
| 1985 | -del "$(OBJDIR)\translate$E" 2>NUL |
| 1986 | -del "$(OBJDIR)\translate$P" 2>NUL |
| 1987 | -del "$(OBJDIR)\mkindex$E" 2>NUL |
| 1988 | -del "$(OBJDIR)\mkindex$P" 2>NUL |
| 1989 | -del "$(OBJDIR)\makeheaders$E" 2>NUL |
| @@ -2030,14 +2028,11 @@ | |
| 2030 | writeln "\"\$(OX)\\${s}_.c\" : \"\$(SRCDIR)\\$s.c\"" |
| 2031 | writeln "\t\"\$(OBJDIR)\\translate\$E\" \$** > \$@\n" |
| 2032 | } |
| 2033 | |
| 2034 | writeln "\"\$(OX)\\fossil.res\" : \"\$(B)\\win\\fossil.rc\"" |
| 2035 | writeln "\t\$(RCC) /fo \$@ \$**\n" |
| 2036 | |
| 2037 | writeln "\"\$(OX)\\fossil.exe.manifest\" : \"\$(B)\\win\\fossil.exe.manifest\"" |
| 2038 | writeln "\tcopy /Y \$** \$@ \n" |
| 2039 | |
| 2040 | writeln "\"\$(OX)\\headers\": \"\$(OBJDIR)\\makeheaders\$E\" \"\$(OX)\\page_index.h\" \"\$(OX)\\builtin_data.h\" \"\$(OX)\\default_css.h\" \"\$(OX)\\VERSION.h\"" |
| 2041 | writeln -nonewline "\t\"\$(OBJDIR)\\makeheaders\$E\" " |
| 2042 | set i 0 |
| 2043 | foreach s [lsort $src] { |
| 2044 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1821,23 +1821,22 @@ | |
| 1821 | BASEAPPNAME = fossil |
| 1822 | !endif |
| 1823 | |
| 1824 | APPNAME = $(OX)\$(BASEAPPNAME)$(E) |
| 1825 | PDBNAME = $(OX)\$(BASEAPPNAME)$(P) |
| 1826 | APPTARGETS = |
| 1827 | |
| 1828 | all: "$(OX)" "$(APPNAME)" |
| 1829 | |
| 1830 | $(BASEAPPNAME): "$(APPNAME)" |
| 1831 | |
| 1832 | $(BASEAPPNAME)$(E): "$(APPNAME)" |
| 1833 | |
| 1834 | install: "$(APPNAME)" |
| 1835 | echo F | xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"\* |
| 1836 | !if $(DEBUG)!=0 |
| 1837 | echo F | xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"\* |
| 1838 | !endif |
| 1839 | |
| 1840 | $(OX): |
| 1841 | @-mkdir $@ |
| 1842 | |
| @@ -1881,15 +1880,15 @@ | |
| 1880 | !if $(FOSSIL_BUILD_SSL)!=0 |
| 1881 | APPTARGETS = $(APPTARGETS) openssl |
| 1882 | !endif |
| 1883 | !endif |
| 1884 | |
| 1885 | "$(APPNAME)" : $(APPTARGETS) "$(OBJDIR)\translate$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\codecheck1$E" "$(OX)\headers" $(OBJ) "$(OX)\linkopts" |
| 1886 | "$(OBJDIR)\codecheck1$E" $(SRC) |
| 1887 | link $(LDFLAGS) /OUT:$@ /PDB:$(@D)\ $(LIBDIR) Wsetargv.obj "$(OX)\fossil.res" @"$(OX)\linkopts" |
| 1888 | if exist "$(B)\win\fossil.exe.manifest" <<<NEXT_LINE>>> |
| 1889 | $(MTC) -nologo -manifest "$(B)\win\fossil.exe.manifest" -outputresource:$@;1 |
| 1890 | |
| 1891 | "$(OX)\linkopts": "$(B)\win\Makefile.msc"}] |
| 1892 | set redir {>} |
| 1893 | foreach s [lsort [concat $src $AdditionalObj]] { |
| 1894 | writeln "\techo \"\$(OX)\\$s.obj\" $redir \$@" |
| @@ -1979,11 +1978,10 @@ | |
| 1978 | -del "$(OX)\vc*.pdb" 2>NUL |
| 1979 | |
| 1980 | clean: cleanx |
| 1981 | -del "$(APPNAME)" 2>NUL |
| 1982 | -del "$(PDBNAME)" 2>NUL |
| 1983 | -del "$(OBJDIR)\translate$E" 2>NUL |
| 1984 | -del "$(OBJDIR)\translate$P" 2>NUL |
| 1985 | -del "$(OBJDIR)\mkindex$E" 2>NUL |
| 1986 | -del "$(OBJDIR)\mkindex$P" 2>NUL |
| 1987 | -del "$(OBJDIR)\makeheaders$E" 2>NUL |
| @@ -2030,14 +2028,11 @@ | |
| 2028 | writeln "\"\$(OX)\\${s}_.c\" : \"\$(SRCDIR)\\$s.c\"" |
| 2029 | writeln "\t\"\$(OBJDIR)\\translate\$E\" \$** > \$@\n" |
| 2030 | } |
| 2031 | |
| 2032 | writeln "\"\$(OX)\\fossil.res\" : \"\$(B)\\win\\fossil.rc\"" |
| 2033 | writeln "\t\$(RCC) /fo \$@ \$**\n" |
| 2034 | |
| 2035 | writeln "\"\$(OX)\\headers\": \"\$(OBJDIR)\\makeheaders\$E\" \"\$(OX)\\page_index.h\" \"\$(OX)\\builtin_data.h\" \"\$(OX)\\default_css.h\" \"\$(OX)\\VERSION.h\"" |
| 2036 | writeln -nonewline "\t\"\$(OBJDIR)\\makeheaders\$E\" " |
| 2037 | set i 0 |
| 2038 | foreach s [lsort $src] { |
| 2039 |
+6
-11
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -757,23 +757,22 @@ | ||
| 757 | 757 | BASEAPPNAME = fossil |
| 758 | 758 | !endif |
| 759 | 759 | |
| 760 | 760 | APPNAME = $(OX)\$(BASEAPPNAME)$(E) |
| 761 | 761 | PDBNAME = $(OX)\$(BASEAPPNAME)$(P) |
| 762 | -APPMANIFEST = $(APPNAME).manifest | |
| 763 | 762 | APPTARGETS = |
| 764 | 763 | |
| 765 | 764 | all: "$(OX)" "$(APPNAME)" |
| 766 | 765 | |
| 767 | 766 | $(BASEAPPNAME): "$(APPNAME)" |
| 768 | 767 | |
| 769 | 768 | $(BASEAPPNAME)$(E): "$(APPNAME)" |
| 770 | 769 | |
| 771 | 770 | install: "$(APPNAME)" |
| 772 | - echo F | xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"\* | |
| 771 | + echo F | xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"\* | |
| 773 | 772 | !if $(DEBUG)!=0 |
| 774 | - echo F | xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"\* | |
| 773 | + echo F | xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"\* | |
| 775 | 774 | !endif |
| 776 | 775 | |
| 777 | 776 | $(OX): |
| 778 | 777 | @-mkdir $@ |
| 779 | 778 | |
| @@ -817,15 +816,15 @@ | ||
| 817 | 816 | !if $(FOSSIL_BUILD_SSL)!=0 |
| 818 | 817 | APPTARGETS = $(APPTARGETS) openssl |
| 819 | 818 | !endif |
| 820 | 819 | !endif |
| 821 | 820 | |
| 822 | -"$(APPNAME)" : "$(APPMANIFEST)" $(APPTARGETS) "$(OBJDIR)\translate$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\codecheck1$E" "$(OX)\headers" $(OBJ) "$(OX)\linkopts" | |
| 821 | +"$(APPNAME)" : $(APPTARGETS) "$(OBJDIR)\translate$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\codecheck1$E" "$(OX)\headers" $(OBJ) "$(OX)\linkopts" | |
| 823 | 822 | "$(OBJDIR)\codecheck1$E" $(SRC) |
| 824 | 823 | link $(LDFLAGS) /OUT:$@ /PDB:$(@D)\ $(LIBDIR) Wsetargv.obj "$(OX)\fossil.res" @"$(OX)\linkopts" |
| 825 | - if exist "$(APPMANIFEST)" \ | |
| 826 | - $(MTC) -nologo -manifest "$(APPMANIFEST)" -outputresource:$@;1 | |
| 824 | + if exist "$(B)\win\fossil.exe.manifest" \ | |
| 825 | + $(MTC) -nologo -manifest "$(B)\win\fossil.exe.manifest" -outputresource:$@;1 | |
| 827 | 826 | |
| 828 | 827 | "$(OX)\linkopts": "$(B)\win\Makefile.msc" |
| 829 | 828 | echo "$(OX)\add.obj" > $@ |
| 830 | 829 | echo "$(OX)\alerts.obj" >> $@ |
| 831 | 830 | echo "$(OX)\allrepo.obj" >> $@ |
| @@ -1057,11 +1056,10 @@ | ||
| 1057 | 1056 | -del "$(OX)\vc*.pdb" 2>NUL |
| 1058 | 1057 | |
| 1059 | 1058 | clean: cleanx |
| 1060 | 1059 | -del "$(APPNAME)" 2>NUL |
| 1061 | 1060 | -del "$(PDBNAME)" 2>NUL |
| 1062 | - -del "$(APPMANIFEST)" 2>NUL | |
| 1063 | 1061 | -del "$(OBJDIR)\translate$E" 2>NUL |
| 1064 | 1062 | -del "$(OBJDIR)\translate$P" 2>NUL |
| 1065 | 1063 | -del "$(OBJDIR)\mkindex$E" 2>NUL |
| 1066 | 1064 | -del "$(OBJDIR)\mkindex$P" 2>NUL |
| 1067 | 1065 | -del "$(OBJDIR)\makeheaders$E" 2>NUL |
| @@ -2044,14 +2042,11 @@ | ||
| 2044 | 2042 | |
| 2045 | 2043 | "$(OX)\zip_.c" : "$(SRCDIR)\zip.c" |
| 2046 | 2044 | "$(OBJDIR)\translate$E" $** > $@ |
| 2047 | 2045 | |
| 2048 | 2046 | "$(OX)\fossil.res" : "$(B)\win\fossil.rc" |
| 2049 | - $(RCC) /fo $@ $** | |
| 2050 | - | |
| 2051 | -"$(OX)\fossil.exe.manifest" : "$(B)\win\fossil.exe.manifest" | |
| 2052 | - copy /Y $** $@ | |
| 2047 | + $(RCC) /fo $@ $** | |
| 2053 | 2048 | |
| 2054 | 2049 | "$(OX)\headers": "$(OBJDIR)\makeheaders$E" "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\default_css.h" "$(OX)\VERSION.h" |
| 2055 | 2050 | "$(OBJDIR)\makeheaders$E" "$(OX)\add_.c":"$(OX)\add.h" \ |
| 2056 | 2051 | "$(OX)\alerts_.c":"$(OX)\alerts.h" \ |
| 2057 | 2052 | "$(OX)\allrepo_.c":"$(OX)\allrepo.h" \ |
| 2058 | 2053 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -757,23 +757,22 @@ | |
| 757 | BASEAPPNAME = fossil |
| 758 | !endif |
| 759 | |
| 760 | APPNAME = $(OX)\$(BASEAPPNAME)$(E) |
| 761 | PDBNAME = $(OX)\$(BASEAPPNAME)$(P) |
| 762 | APPMANIFEST = $(APPNAME).manifest |
| 763 | APPTARGETS = |
| 764 | |
| 765 | all: "$(OX)" "$(APPNAME)" |
| 766 | |
| 767 | $(BASEAPPNAME): "$(APPNAME)" |
| 768 | |
| 769 | $(BASEAPPNAME)$(E): "$(APPNAME)" |
| 770 | |
| 771 | install: "$(APPNAME)" |
| 772 | echo F | xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"\* |
| 773 | !if $(DEBUG)!=0 |
| 774 | echo F | xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"\* |
| 775 | !endif |
| 776 | |
| 777 | $(OX): |
| 778 | @-mkdir $@ |
| 779 | |
| @@ -817,15 +816,15 @@ | |
| 817 | !if $(FOSSIL_BUILD_SSL)!=0 |
| 818 | APPTARGETS = $(APPTARGETS) openssl |
| 819 | !endif |
| 820 | !endif |
| 821 | |
| 822 | "$(APPNAME)" : "$(APPMANIFEST)" $(APPTARGETS) "$(OBJDIR)\translate$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\codecheck1$E" "$(OX)\headers" $(OBJ) "$(OX)\linkopts" |
| 823 | "$(OBJDIR)\codecheck1$E" $(SRC) |
| 824 | link $(LDFLAGS) /OUT:$@ /PDB:$(@D)\ $(LIBDIR) Wsetargv.obj "$(OX)\fossil.res" @"$(OX)\linkopts" |
| 825 | if exist "$(APPMANIFEST)" \ |
| 826 | $(MTC) -nologo -manifest "$(APPMANIFEST)" -outputresource:$@;1 |
| 827 | |
| 828 | "$(OX)\linkopts": "$(B)\win\Makefile.msc" |
| 829 | echo "$(OX)\add.obj" > $@ |
| 830 | echo "$(OX)\alerts.obj" >> $@ |
| 831 | echo "$(OX)\allrepo.obj" >> $@ |
| @@ -1057,11 +1056,10 @@ | |
| 1057 | -del "$(OX)\vc*.pdb" 2>NUL |
| 1058 | |
| 1059 | clean: cleanx |
| 1060 | -del "$(APPNAME)" 2>NUL |
| 1061 | -del "$(PDBNAME)" 2>NUL |
| 1062 | -del "$(APPMANIFEST)" 2>NUL |
| 1063 | -del "$(OBJDIR)\translate$E" 2>NUL |
| 1064 | -del "$(OBJDIR)\translate$P" 2>NUL |
| 1065 | -del "$(OBJDIR)\mkindex$E" 2>NUL |
| 1066 | -del "$(OBJDIR)\mkindex$P" 2>NUL |
| 1067 | -del "$(OBJDIR)\makeheaders$E" 2>NUL |
| @@ -2044,14 +2042,11 @@ | |
| 2044 | |
| 2045 | "$(OX)\zip_.c" : "$(SRCDIR)\zip.c" |
| 2046 | "$(OBJDIR)\translate$E" $** > $@ |
| 2047 | |
| 2048 | "$(OX)\fossil.res" : "$(B)\win\fossil.rc" |
| 2049 | $(RCC) /fo $@ $** |
| 2050 | |
| 2051 | "$(OX)\fossil.exe.manifest" : "$(B)\win\fossil.exe.manifest" |
| 2052 | copy /Y $** $@ |
| 2053 | |
| 2054 | "$(OX)\headers": "$(OBJDIR)\makeheaders$E" "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\default_css.h" "$(OX)\VERSION.h" |
| 2055 | "$(OBJDIR)\makeheaders$E" "$(OX)\add_.c":"$(OX)\add.h" \ |
| 2056 | "$(OX)\alerts_.c":"$(OX)\alerts.h" \ |
| 2057 | "$(OX)\allrepo_.c":"$(OX)\allrepo.h" \ |
| 2058 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -757,23 +757,22 @@ | |
| 757 | BASEAPPNAME = fossil |
| 758 | !endif |
| 759 | |
| 760 | APPNAME = $(OX)\$(BASEAPPNAME)$(E) |
| 761 | PDBNAME = $(OX)\$(BASEAPPNAME)$(P) |
| 762 | APPTARGETS = |
| 763 | |
| 764 | all: "$(OX)" "$(APPNAME)" |
| 765 | |
| 766 | $(BASEAPPNAME): "$(APPNAME)" |
| 767 | |
| 768 | $(BASEAPPNAME)$(E): "$(APPNAME)" |
| 769 | |
| 770 | install: "$(APPNAME)" |
| 771 | echo F | xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"\* |
| 772 | !if $(DEBUG)!=0 |
| 773 | echo F | xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"\* |
| 774 | !endif |
| 775 | |
| 776 | $(OX): |
| 777 | @-mkdir $@ |
| 778 | |
| @@ -817,15 +816,15 @@ | |
| 816 | !if $(FOSSIL_BUILD_SSL)!=0 |
| 817 | APPTARGETS = $(APPTARGETS) openssl |
| 818 | !endif |
| 819 | !endif |
| 820 | |
| 821 | "$(APPNAME)" : $(APPTARGETS) "$(OBJDIR)\translate$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\codecheck1$E" "$(OX)\headers" $(OBJ) "$(OX)\linkopts" |
| 822 | "$(OBJDIR)\codecheck1$E" $(SRC) |
| 823 | link $(LDFLAGS) /OUT:$@ /PDB:$(@D)\ $(LIBDIR) Wsetargv.obj "$(OX)\fossil.res" @"$(OX)\linkopts" |
| 824 | if exist "$(B)\win\fossil.exe.manifest" \ |
| 825 | $(MTC) -nologo -manifest "$(B)\win\fossil.exe.manifest" -outputresource:$@;1 |
| 826 | |
| 827 | "$(OX)\linkopts": "$(B)\win\Makefile.msc" |
| 828 | echo "$(OX)\add.obj" > $@ |
| 829 | echo "$(OX)\alerts.obj" >> $@ |
| 830 | echo "$(OX)\allrepo.obj" >> $@ |
| @@ -1057,11 +1056,10 @@ | |
| 1056 | -del "$(OX)\vc*.pdb" 2>NUL |
| 1057 | |
| 1058 | clean: cleanx |
| 1059 | -del "$(APPNAME)" 2>NUL |
| 1060 | -del "$(PDBNAME)" 2>NUL |
| 1061 | -del "$(OBJDIR)\translate$E" 2>NUL |
| 1062 | -del "$(OBJDIR)\translate$P" 2>NUL |
| 1063 | -del "$(OBJDIR)\mkindex$E" 2>NUL |
| 1064 | -del "$(OBJDIR)\mkindex$P" 2>NUL |
| 1065 | -del "$(OBJDIR)\makeheaders$E" 2>NUL |
| @@ -2044,14 +2042,11 @@ | |
| 2042 | |
| 2043 | "$(OX)\zip_.c" : "$(SRCDIR)\zip.c" |
| 2044 | "$(OBJDIR)\translate$E" $** > $@ |
| 2045 | |
| 2046 | "$(OX)\fossil.res" : "$(B)\win\fossil.rc" |
| 2047 | $(RCC) /fo $@ $** |
| 2048 | |
| 2049 | "$(OX)\headers": "$(OBJDIR)\makeheaders$E" "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\default_css.h" "$(OX)\VERSION.h" |
| 2050 | "$(OBJDIR)\makeheaders$E" "$(OX)\add_.c":"$(OX)\add.h" \ |
| 2051 | "$(OX)\alerts_.c":"$(OX)\alerts.h" \ |
| 2052 | "$(OX)\allrepo_.c":"$(OX)\allrepo.h" \ |
| 2053 |