all repos — fluxbox @ 59f59801fcad89ae52498804ab7812bc33d58000

custom fork of the fluxbox windowmanager

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.
Mathias Gumz akira at fluxbox dot org
commit

59f59801fcad89ae52498804ab7812bc33d58000

parent

7c26156842418c7aa82cf5c85d573fa049f19a54

1 files changed, 6 insertions(+), 0 deletions(-)

jump to
M src/Keys.ccsrc/Keys.cc

@@ -35,6 +35,7 @@ #include "FbTk/Command.hh"

#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"

@@ -108,6 +109,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) {