From 6d22479fc2249d2907ae7f63f6cfb26e30a3082a Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 14 Sep 2014 19:09:33 +0000 Subject: [PATCH] lo.mk: Add TOOLS_INCLUDE_DIR variable Signed-off-by: Jan Lindemann --- make/lo.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/make/lo.mk b/make/lo.mk index 0bd0f79b..9860e493 100644 --- a/make/lo.mk +++ b/make/lo.mk @@ -1,5 +1,6 @@ # === change this > TOOLS_DIR ?= $(TOPDIR)/tools +TOOLS_INCLUDE_DIR ?= $(TOOLS_DIR) CPP_PREFIX ?= YLo CPP_SUFFIX ?= SO_PREFIX ?= lo_ @@ -9,7 +10,7 @@ LOADABLE_OBJ_HOOK ?= LOADABLE_OBJECT_HOOK include $(MODDIR)/make/defs.mk .PRECIOUS: %.cpp %.o -LOADABLE_OBJS_BASE = $(patsubst %$(CPP_SUFFIX),%,$(patsubst $(CPP_PREFIX)%,%,$(basename $(notdir $(wildcard $(TOOLS_DIR)/$(CPP_PREFIX)*$(CPP_SUFFIX).h))))) +LOADABLE_OBJS_BASE = $(patsubst %$(CPP_SUFFIX),%,$(patsubst $(CPP_PREFIX)%,%,$(basename $(notdir $(wildcard $(TOOLS_INCLUDE_DIR)/$(CPP_PREFIX)*$(CPP_SUFFIX).h))))) LOADABLE_OBJS = $(filter-out $(LOADABLE_OBJ_IGNORE),$(LOADABLE_OBJS_BASE)) LOADABLE_OBJ_CPP = $(patsubst %,%.cpp,$(LOADABLE_OBJS)) LOADABLE_OBJS_O = $(patsubst %,%.o,$(LOADABLE_OBJS)) @@ -44,7 +45,7 @@ clean.lo: profclean clean.generated $(SO_PREFIX)%.so $(SO_PREFIX)%.dll: %.o $(CPP_PREFIX)%.o $(OTHER_LIB) $(CPP) $^ -L. $(OTHER_LIB_LDFLAGS) -shared $(BUILD_LDFLAGS) -o $@ -%.cpp: $(TOOLS_DIR)/$(CPP_PREFIX)%$(CPP_SUFFIX).h +%.cpp: $(TOOLS_INCLUDE_DIR)/$(CPP_PREFIX)%$(CPP_SUFFIX).h echo "#include \"$<\"" > $@.tmp if [ "$(LO_NAMESPACE)" ]; then echo "using namespace $(LO_NAMESPACE);" >> $@.tmp; fi echo "$(LOADABLE_OBJ_HOOK)($(CPP_PREFIX)$*$(CPP_SUFFIX));" >> $@.tmp