Fossil SCM

Get the revised makefile working with MSVC.

drh 2014-10-27 17:21 UTC separate-resource-files

Commit fdc96f49977d75a6540f70909091795a1415daac

Parent d93d92eb5ac2a7e…

2 files changed +14 -1 +2

M src/makemake.tcl

+14 -1

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -12,12 +12,15 @@
12	12	# tclsh makemake.tcl
13	13	#
14	14	#############################################################################
15	15
16	16	# Basenames of all source files that get preprocessed using
17		-# "translate" and "makeheaders". To add new source files to the
	17	+# "translate" and "makeheaders". To add new C-language source files to the
18	18	# project, simply add the basename to this list and rerun this script.
	19	+#
	20	+# Set the separate extra_files variable further down for how to add non-C
	21	+# files, such as string and BLOB resources.
19	22	#
20	23	set src {
21	24	add
22	25	allrepo
23	26	attach
		@@ -1400,10 +1403,20 @@
1400	1403	writeln " \\"
1401	1404	writeln -nonewline " "
1402	1405	}
1403	1406	writeln -nonewline "${s}_.c"; incr i
1404	1407	}
	1408	+writeln "\n"
	1409	+writeln -nonewline "EXTRA_FILES = "
	1410	+set i 0
	1411	+foreach s [lsort $extra_files] {
	1412	+ if {$i > 0} {
	1413	+ writeln " \\"
	1414	+ writeln -nonewline " "
	1415	+ }
	1416	+ writeln -nonewline "\$(SRCDIR)\\${s}"; incr i
	1417	+}
1405	1418	writeln "\n"
1406	1419	set AdditionalObj [list shell sqlite3 th th_lang th_tcl cson_amalgamation]
1407	1420	writeln -nonewline "OBJ = "
1408	1421	set i 0
1409	1422	foreach s [lsort [concat $src $AdditionalObj]] {
1410	1423

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -12,12 +12,15 @@
12	# tclsh makemake.tcl
13	#
14	#############################################################################
15
16	# Basenames of all source files that get preprocessed using
17	# "translate" and "makeheaders". To add new source files to the
18	# project, simply add the basename to this list and rerun this script.



19	#
20	set src {
21	add
22	allrepo
23	attach
	@@ -1400,10 +1403,20 @@
1400	writeln " \\"
1401	writeln -nonewline " "
1402	}
1403	writeln -nonewline "${s}_.c"; incr i
1404	}










1405	writeln "\n"
1406	set AdditionalObj [list shell sqlite3 th th_lang th_tcl cson_amalgamation]
1407	writeln -nonewline "OBJ = "
1408	set i 0
1409	foreach s [lsort [concat $src $AdditionalObj]] {
1410

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -12,12 +12,15 @@
12	# tclsh makemake.tcl
13	#
14	#############################################################################
15
16	# Basenames of all source files that get preprocessed using
17	# "translate" and "makeheaders". To add new C-language source files to the
18	# project, simply add the basename to this list and rerun this script.
19	#
20	# Set the separate extra_files variable further down for how to add non-C
21	# files, such as string and BLOB resources.
22	#
23	set src {
24	add
25	allrepo
26	attach
	@@ -1400,10 +1403,20 @@
1403	writeln " \\"
1404	writeln -nonewline " "
1405	}
1406	writeln -nonewline "${s}_.c"; incr i
1407	}
1408	writeln "\n"
1409	writeln -nonewline "EXTRA_FILES = "
1410	set i 0
1411	foreach s [lsort $extra_files] {
1412	if {$i > 0} {
1413	writeln " \\"
1414	writeln -nonewline " "
1415	}
1416	writeln -nonewline "\$(SRCDIR)\\${s}"; incr i
1417	}
1418	writeln "\n"
1419	set AdditionalObj [list shell sqlite3 th th_lang th_tcl cson_amalgamation]
1420	writeln -nonewline "OBJ = "
1421	set i 0
1422	foreach s [lsort [concat $src $AdditionalObj]] {
1423

M win/Makefile.msc