upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-28 03:45:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Fix linking issues with wesnoth and test targets

Browse Source 
The GUI2 combobox widget code is linked into a separate .a library that
does not include one of its dependencies, gui2::tdrop_down_list. This
causes link order issues and renders the wesnoth and test targets
unlinkable with GCC 5.3.1 and binutils 2.26 at least.
This commit is contained in:
Ignacio R. Morelle 2016-04-18 21:57:46 -03:00
parent 20f67bf4a0
commit 8d290fc5b7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -547,6 +547,7 @@ add_library(wesnoth-gui_tooltip
# behavior of the widgets. It also contains the builder code
# for the widgets since the code has inter dependencies.
set(wesnoth-gui_widget_SRC
gui/dialogs/drop_down_list.cpp
gui/widgets/button.cpp
gui/widgets/combobox.cpp
gui/widgets/container.cpp
@ -819,7 +820,6 @@ set(wesnoth-main_SRC
gui/dialogs/depcheck_confirm_change.cpp
gui/dialogs/depcheck_select_new.cpp
gui/dialogs/dialog.cpp
gui/dialogs/drop_down_list.cpp
gui/dialogs/edit_label.cpp
gui/dialogs/editor/custom_tod.cpp
gui/dialogs/editor/edit_label.cpp