From f63810fbc89158d5637e4f554436c80140569024 Mon Sep 17 00:00:00 2001 From: Ben Harris Date: Sat, 31 Dec 2022 09:28:54 +0000 Subject: [PATCH] Don't use Null Game's extra source files for all GUI programs 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. --- cmake/setup.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/setup.cmake b/cmake/setup.cmake index e8e0309..344d028 100644 --- a/cmake/setup.cmake +++ b/cmake/setup.cmake @@ -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})