simon-git: puzzles (main): Simon Tatham

[Commits to Tartarus hosted VCS]

TL;DR:
  b05a975 Make the icons build step optional.
  76aa961 Provide pre-built icons in the source tarball.
  306fab3 Stop automatically adding warning flags and -Werror.
  dd8164b Unix: allow adding a prefix to all the puzzle names.

Repository:     https://git.tartarus.org/simon/puzzles.git
On the web:     https://git.tartarus.org/?p=simon/puzzles.git
Branch updated: main
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2021-03-31 20:32:52

commit b05a975feeef0abfa5dd38837217b8717e0e7539
web diff https://git.tartarus.org/?p=simon/puzzles.git;a=commitdiff;h=b05a975feeef0abfa5dd38837217b8717e0e7539;hp=71c66b6fbd965a891bdf6546e4d0571da018db8b
Author: Simon Tatham <anakin at pobox.com>
Date:   Wed Mar 31 18:44:44 2021 +0100

    Make the icons build step optional.
    
    This way, ImageMagick is no longer a hard build dependency. For
    developers or users, building puzzles without nice icons is preferable
    to not building them at all.
    
    (Also, thanks to Michael Quevillon for pointing out very promptly that
    my use of 'REQUIRED' in the find_program command was implicitly
    depending on a version of CMake in advance of my minimum_required
    specification. This change fixes that too, in passing.)

 icons/icons.cmake | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 76aa9619c07bc1a62fafa99e14dbd187ea9aa565
web diff https://git.tartarus.org/?p=simon/puzzles.git;a=commitdiff;h=76aa9619c07bc1a62fafa99e14dbd187ea9aa565;hp=b05a975feeef0abfa5dd38837217b8717e0e7539
Author: Simon Tatham <anakin at pobox.com>
Date:   Wed Mar 31 18:44:44 2021 +0100

    Provide pre-built icons in the source tarball.
    
    This reinstates the feature of the previous build system, that the C
    icon files for the GTK puzzles were included in the source tarball, so
    that users building from that instead of from the raw git repo would
    not need to run the fiddly piece of build that regenerates them.
    
    Running that fiddly piece of build is much easier in the CMake world
    (because it's integrated with the main makefile), but it has a build
    dependency on ImageMagick which is easily avoided.
    
    The makefile will still build the icons if it _can_. But in the case
    where it can't, it will use pre-built icon source files if they're
    available, and only fall back to no-icon.c if it can't even do that.
    (So a user checking out from git and building without ImageMagick
    present will still be able to build _something_ playable.)

 Buildscr                   | 23 +++++++++++++----------
 cmake/platforms/unix.cmake | 12 ++++++++++++
 icons/icons.cmake          |  1 +
 3 files changed, 26 insertions(+), 10 deletions(-)

commit 306fab356e357ef13578667b476abce706a55203
web diff https://git.tartarus.org/?p=simon/puzzles.git;a=commitdiff;h=306fab356e357ef13578667b476abce706a55203;hp=76aa9619c07bc1a62fafa99e14dbd187ea9aa565
Author: Simon Tatham <anakin at pobox.com>
Date:   Wed Mar 31 18:44:44 2021 +0100

    Stop automatically adding warning flags and -Werror.
    
    It's better to be lax for normal users trying to build the puzzles
    from source to actually run them. That way, warning changes in some
    particular compiler I haven't seen yet won't break the build.
    
    Instead, I've invented a cmake setting -DSTRICT=ON which turns on all
    those flags. So I can build with them myself, to ensure the code is as
    portable as possible. And that flag is set in Buildscr, so that my
    official builds won't complete until that warning mode is satisfied.

 Buildscr                   |  6 +++++-
 cmake/platforms/unix.cmake | 21 +++------------------
 2 files changed, 8 insertions(+), 19 deletions(-)

commit dd8164b77407fef0c56b426eb0b9a49ddeed13fa
web diff https://git.tartarus.org/?p=simon/puzzles.git;a=commitdiff;h=dd8164b77407fef0c56b426eb0b9a49ddeed13fa;hp=306fab356e357ef13578667b476abce706a55203
Author: Simon Tatham <anakin at pobox.com>
Date:   Wed Mar 31 18:44:44 2021 +0100

    Unix: allow adding a prefix to all the puzzle names.
    
    A distro maintainer reminds me that downstreams often want to rename
    my quite generic executable names to avoid clashes in bin directories.
    Added a cmake option -DOUTPUT_NAME to make that easy.

 cmake/platforms/unix.cmake | 2 ++
 1 file changed, 2 insertions(+)