zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 08:01:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Provide pre-built icons in the source tarball.

Browse Source 
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.)
This commit is contained in:
Simon Tatham
2021-03-31 18:44:44 +01:00
parent b05a975fee
commit 76aa9619c0
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/platforms/unix.cmake
View File

@ -51,9 +51,21 @@ endif()
function(get_platform_puzzle_extra_source_files OUTVAR NAME)
if(build_icons AND EXISTS ${CMAKE_SOURCE_DIR}/icons/${NAME}.sav)
# If we have the equipment to rebuild the puzzles' icon images
# from scratch, do so. Then changes in the puzzle display code
# will cause the icon to auto-update.
build_icon(${NAME})
set(c_icon_file ${CMAKE_BINARY_DIR}/icons/${NAME}-icon.c)
elseif(EXISTS ${CMAKE_SOURCE_DIR}/icons/${NAME}-icon.c)
# Failing that, use a pre-built icon file in the 'icons'
# subdirectory, if there is one. (They don't exist in git, but the
# distribution tarball will have pre-built them and put them in
# there, so that users building from that can still have icons
# even if they don't have the wherewithal to rebuild them.)
set(c_icon_file ${CMAKE_SOURCE_DIR}/icons/${NAME}-icon.c)
else()
# Failing even that, include no-icon.c to satisfy the link-time
# dependencies. The puzzles will build without nice icons.
set(c_icon_file ${CMAKE_SOURCE_DIR}/no-icon.c)
endif()