From 59f59801fcad89ae52498804ab7812bc33d58000 Mon Sep 17 00:00:00 2001 From: Mathias Gumz <akira at fluxbox dot org> Date: Wed, 13 Feb 2013 10:50:05 +0100 Subject: Fix missing LogicCommands By removing FbTk/LogicCommands.o from LDADD in src/Makefile.am (commit 06655f6) I prevented the linker to pick up FbTk/LogicCommands.o and thus rendered all logic-commands useless. Using a small helper object to pull in the dependency fixes this problem without relying on manually tweaking the build system. --- src/Keys.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Keys.cc b/src/Keys.cc index c4ad5ea..388ec52 100644 --- a/src/Keys.cc +++ b/src/Keys.cc @@ -35,6 +35,7 @@ #include "FbTk/RefCount.hh" #include "FbTk/KeyUtil.hh" #include "FbTk/CommandParser.hh" +#include "FbTk/LogicCommands.hh" #include "FbTk/I18n.hh" #include "FbTk/AutoReloadHelper.hh" #include "FbTk/STLUtil.hh" @@ -109,6 +110,11 @@ using FbTk::STLUtil::destroyAndClearSecond; namespace { +// enforces the linking of FbTk/LogicCommands +FbTk::Command<void>* link_helper = FbTk::IfCommand::parse("", "", false); + + + // candidate for FbTk::StringUtil ? int extractKeyFromString(const std::string& in, const char* start_pattern, unsigned int& key) { -- cgit v0.11.2