Fossil SCM

Fix makemake.tcl and Makefile.msc to build on Windows.

danield 2022-01-27 15:17 pickhr-prototype

Commit 2d354a6e7fca46ee6c90ce0b101bb14ec58c2e6f07d93016271fec11b46a3613

Parent bc6bda98a120343…

2 files changed +2 -2 +2 -2

M tools/makemake.tcl

+2 -2

		--- tools/makemake.tcl
		+++ tools/makemake.tcl
		@@ -1765,11 +1765,11 @@
1765	1765	writeln -nonewline "\"\$(OX)\\${s}_.c\""; incr i
1766	1766	}
1767	1767	foreach s [lsort $src_ext] {
1768	1768	writeln " \\"
1769	1769	writeln -nonewline " "
1770		- writeln -nonewline "\"\$(OX)\\${s}_.c\""; incr i
	1770	+ writeln -nonewline "\"\$(SRCDIR_extsrc)\\${s}.c\""; incr i
1771	1771	}
1772	1772	writeln "\n"
1773	1773	writeln -nonewline "EXTRA_FILES = "
1774	1774	set i 0
1775	1775	foreach s [lsort $extra_files] {
		@@ -2013,11 +2013,11 @@
2013	2013	writeln -nonewline "\"\$(OX)\\${s}_.c\":\"\$(OX)\\$s.h\""; incr i
2014	2014	}
2015	2015	foreach s [lsort $src_ext] {
2016	2016	writeln " \\"
2017	2017	writeln -nonewline "\t\t\t"
2018		- writeln -nonewline "\"\$(OX)\\${s}_.c\":\"\$(OX)\\$s.h\""; incr i
	2018	+ writeln -nonewline "\"\$(SRCDIR_extsrc)\\${s}.c\":\"\$(OX)\\$s.h\""; incr i
2019	2019	}
2020	2020	writeln " \\\n\t\t\t\"\$(SRCDIR_extsrc)\\sqlite3.h\" \\"
2021	2021	writeln "\t\t\t\"\$(SRCDIR)\\th.h\" \\"
2022	2022	writeln "\t\t\t\"\$(OX)\\VERSION.h\" \\"
2023	2023	writeln "\t\t\t\"\$(SRCDIR_extsrc)\\cson_amalgamation.h\""
2024	2024

	--- tools/makemake.tcl
	+++ tools/makemake.tcl
	@@ -1765,11 +1765,11 @@
1765	writeln -nonewline "\"\$(OX)\\${s}_.c\""; incr i
1766	}
1767	foreach s [lsort $src_ext] {
1768	writeln " \\"
1769	writeln -nonewline " "
1770	writeln -nonewline "\"\$(OX)\\${s}_.c\""; incr i
1771	}
1772	writeln "\n"
1773	writeln -nonewline "EXTRA_FILES = "
1774	set i 0
1775	foreach s [lsort $extra_files] {
	@@ -2013,11 +2013,11 @@
2013	writeln -nonewline "\"\$(OX)\\${s}_.c\":\"\$(OX)\\$s.h\""; incr i
2014	}
2015	foreach s [lsort $src_ext] {
2016	writeln " \\"
2017	writeln -nonewline "\t\t\t"
2018	writeln -nonewline "\"\$(OX)\\${s}_.c\":\"\$(OX)\\$s.h\""; incr i
2019	}
2020	writeln " \\\n\t\t\t\"\$(SRCDIR_extsrc)\\sqlite3.h\" \\"
2021	writeln "\t\t\t\"\$(SRCDIR)\\th.h\" \\"
2022	writeln "\t\t\t\"\$(OX)\\VERSION.h\" \\"
2023	writeln "\t\t\t\"\$(SRCDIR_extsrc)\\cson_amalgamation.h\""
2024

	--- tools/makemake.tcl
	+++ tools/makemake.tcl
	@@ -1765,11 +1765,11 @@
1765	writeln -nonewline "\"\$(OX)\\${s}_.c\""; incr i
1766	}
1767	foreach s [lsort $src_ext] {
1768	writeln " \\"
1769	writeln -nonewline " "
1770	writeln -nonewline "\"\$(SRCDIR_extsrc)\\${s}.c\""; incr i
1771	}
1772	writeln "\n"
1773	writeln -nonewline "EXTRA_FILES = "
1774	set i 0
1775	foreach s [lsort $extra_files] {
	@@ -2013,11 +2013,11 @@
2013	writeln -nonewline "\"\$(OX)\\${s}_.c\":\"\$(OX)\\$s.h\""; incr i
2014	}
2015	foreach s [lsort $src_ext] {
2016	writeln " \\"
2017	writeln -nonewline "\t\t\t"
2018	writeln -nonewline "\"\$(SRCDIR_extsrc)\\${s}.c\":\"\$(OX)\\$s.h\""; incr i
2019	}
2020	writeln " \\\n\t\t\t\"\$(SRCDIR_extsrc)\\sqlite3.h\" \\"
2021	writeln "\t\t\t\"\$(SRCDIR)\\th.h\" \\"
2022	writeln "\t\t\t\"\$(OX)\\VERSION.h\" \\"
2023	writeln "\t\t\t\"\$(SRCDIR_extsrc)\\cson_amalgamation.h\""
2024

M win/Makefile.msc

+2 -2

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -491,11 +491,11 @@
491	491	"$(OX)\winfile_.c" \
492	492	"$(OX)\winhttp_.c" \
493	493	"$(OX)\xfer_.c" \
494	494	"$(OX)\xfersetup_.c" \
495	495	"$(OX)\zip_.c" \
496		- "$(OX)\pikchr_.c"
	496	+ "$(SRCDIR_extsrc)\pikchr.c"
497	497
498	498	EXTRA_FILES = "$(SRCDIR)\..\skins\ardoise\css.txt" \
499	499	"$(SRCDIR)\..\skins\ardoise\details.txt" \
500	500	"$(SRCDIR)\..\skins\ardoise\footer.txt" \
501	501	"$(SRCDIR)\..\skins\ardoise\header.txt" \
		@@ -2235,11 +2235,11 @@
2235	2235	"$(OX)\winfile_.c":"$(OX)\winfile.h" \
2236	2236	"$(OX)\winhttp_.c":"$(OX)\winhttp.h" \
2237	2237	"$(OX)\xfer_.c":"$(OX)\xfer.h" \
2238	2238	"$(OX)\xfersetup_.c":"$(OX)\xfersetup.h" \
2239	2239	"$(OX)\zip_.c":"$(OX)\zip.h" \
2240		- "$(OX)\pikchr_.c":"$(OX)\pikchr.h" \
	2240	+ "$(SRCDIR_extsrc)\pikchr.c":"$(OX)\pikchr.h" \
2241	2241	"$(SRCDIR_extsrc)\sqlite3.h" \
2242	2242	"$(SRCDIR)\th.h" \
2243	2243	"$(OX)\VERSION.h" \
2244	2244	"$(SRCDIR_extsrc)\cson_amalgamation.h"
2245	2245	@copy /Y nul: $@
2246	2246

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -491,11 +491,11 @@
491	"$(OX)\winfile_.c" \
492	"$(OX)\winhttp_.c" \
493	"$(OX)\xfer_.c" \
494	"$(OX)\xfersetup_.c" \
495	"$(OX)\zip_.c" \
496	"$(OX)\pikchr_.c"
497
498	EXTRA_FILES = "$(SRCDIR)\..\skins\ardoise\css.txt" \
499	"$(SRCDIR)\..\skins\ardoise\details.txt" \
500	"$(SRCDIR)\..\skins\ardoise\footer.txt" \
501	"$(SRCDIR)\..\skins\ardoise\header.txt" \
	@@ -2235,11 +2235,11 @@
2235	"$(OX)\winfile_.c":"$(OX)\winfile.h" \
2236	"$(OX)\winhttp_.c":"$(OX)\winhttp.h" \
2237	"$(OX)\xfer_.c":"$(OX)\xfer.h" \
2238	"$(OX)\xfersetup_.c":"$(OX)\xfersetup.h" \
2239	"$(OX)\zip_.c":"$(OX)\zip.h" \
2240	"$(OX)\pikchr_.c":"$(OX)\pikchr.h" \
2241	"$(SRCDIR_extsrc)\sqlite3.h" \
2242	"$(SRCDIR)\th.h" \
2243	"$(OX)\VERSION.h" \
2244	"$(SRCDIR_extsrc)\cson_amalgamation.h"
2245	@copy /Y nul: $@
2246

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -491,11 +491,11 @@
491	"$(OX)\winfile_.c" \
492	"$(OX)\winhttp_.c" \
493	"$(OX)\xfer_.c" \
494	"$(OX)\xfersetup_.c" \
495	"$(OX)\zip_.c" \
496	"$(SRCDIR_extsrc)\pikchr.c"
497
498	EXTRA_FILES = "$(SRCDIR)\..\skins\ardoise\css.txt" \
499	"$(SRCDIR)\..\skins\ardoise\details.txt" \
500	"$(SRCDIR)\..\skins\ardoise\footer.txt" \
501	"$(SRCDIR)\..\skins\ardoise\header.txt" \
	@@ -2235,11 +2235,11 @@
2235	"$(OX)\winfile_.c":"$(OX)\winfile.h" \
2236	"$(OX)\winhttp_.c":"$(OX)\winhttp.h" \
2237	"$(OX)\xfer_.c":"$(OX)\xfer.h" \
2238	"$(OX)\xfersetup_.c":"$(OX)\xfersetup.h" \
2239	"$(OX)\zip_.c":"$(OX)\zip.h" \
2240	"$(SRCDIR_extsrc)\pikchr.c":"$(OX)\pikchr.h" \
2241	"$(SRCDIR_extsrc)\sqlite3.h" \
2242	"$(SRCDIR)\th.h" \
2243	"$(OX)\VERSION.h" \
2244	"$(SRCDIR_extsrc)\cson_amalgamation.h"
2245	@copy /Y nul: $@
2246