mirror of
git://git.tartarus.org/simon/puzzles.git
synced 2025-04-21 08:01:30 -07:00
Windows: leave puzzles.rc out of auxiliary GUI tools.
There's no reason to put the .rc file into developer tools like galaxieseditor at all. Its current job is to add an icon, and those tools don't have any. I'm about to add version information, and they won't have that either (in particular, no description string like the games do). The CLI developer tools already don't include puzzles.rc, and GUI dev tools are more like those than they are like puzzles. puzzles.rc was being added to an aux GUI tool's source file list by get_platform_puzzle_extra_source_files(), which is called for aux GUI tools as well as for puzzles proper. However, it's not as simple as just eliminating that call, because on Unix, we _do_ need to add the same extra source files to GUI dev tools that we do for puzzles, because gtk.c contains external references to either an array of the puzzle's icons or an empty array indicating that there aren't any, so _something_ has to provide that. So instead, get_platform_puzzle_extra_source_files now takes an extra argument saying whether the program is a real puzzle or an aux tool; windows.cmake leaves out puzzles.rc in the latter case, but unix.cmake puts the icon array in unconditionally.
This commit is contained in:
@ -81,7 +81,7 @@ endif()
|
||||
set(build_cli_programs FALSE)
|
||||
set(build_gui_programs FALSE)
|
||||
|
||||
function(get_platform_puzzle_extra_source_files OUTVAR NAME)
|
||||
function(get_platform_puzzle_extra_source_files OUTVAR NAME AUXILIARY)
|
||||
set(${OUTVAR} PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
|
Reference in New Issue
Block a user