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

Don't use Null Game's extra source files for all GUI programs

Browse Source 
All the not-quite-puzzle GUI programs (only galaxieseditor at this
point) were using the extra source files from Null Game, presumably as a
convenient way of asking not to have an icon on platforms where icons
are provided as extra source files.  Unfortunately, this all went wrong
if Null Game did have a save file for an icon, causing CMake to complain
about multiple definitions of a target.

Now these programs look for extra files under their own names, which
will work just as well since those have no save files to generate icons
from either.
This commit is contained in:
Ben Harris
2022-12-31 09:28:54 +00:00
parent 0363e9e7fd
commit f63810fbc8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/setup.cmake
View File

@ -124,7 +124,7 @@ function(guiprogram NAME)
"" "COMPILE_DEFINITIONS" "" ${ARGN})
if(build_gui_programs)
get_platform_puzzle_extra_source_files(extra_files nullgame)
get_platform_puzzle_extra_source_files(extra_files ${NAME})
add_executable(${NAME} ${OPT_UNPARSED_ARGUMENTS} ${extra_files})
target_link_libraries(${NAME}
common ${platform_gui_libs} ${platform_libs})