Differences From Artifact [0404808a80]:

• Executable file tools/makemake.tcl — part of check-in [be78b70f87] at 2024-11-01 08:18:27 on branch trunk — Change -DHAVE_LINENOISE to -DHAVE_LINENOISE=2 to account for a pending upstream change in extsrc/shell.c. (user: stephan size: 63458) [more...]

To Artifact [0db25f5bb3]:

• Executable file tools/makemake.tcl — part of check-in [bdcacd55be] at 2024-11-28 21:54:04 on branch merge-enhancements — Preliminary implementation of a --tk option to the 3-way-merge command. Lots of work left to do to get this working well. (user: drh size: 63470) [more...]

207
208
209
210
211
212
213

214
215
216
217
218
219
220

}

# Additional resource files that get built into the executable.
# These paths are all resolved from the src/ directory, so must
# be relative to that.
set extra_files {
  diff.tcl

  markdown.md
  wiki.wiki
  *.js
  default.css
  style.*.css
  ../skins/*/*.txt
  sounds/*.wav

>

207
208
209
210
211
212
213
214
215
216
217
218
219
220
221

}

# Additional resource files that get built into the executable.
# These paths are all resolved from the src/ directory, so must
# be relative to that.
set extra_files {
  diff.tcl
  merge.tcl
  markdown.md
  wiki.wiki
  *.js
  default.css
  style.*.css
  ../skins/*/*.txt
  sounds/*.wav