aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2011-06-01 23:50:27 +0200
committerMax Horn2011-06-01 23:57:21 +0200
commit70d5da3bc4362894c875b00ced1b289d18898258 (patch)
tree00876c82a5d7e55db26ba4de60028755201e3f10
parent3429a14c119752daa8d17c499dbffb27a3fe23a5 (diff)
downloadscummvm-rg350-70d5da3bc4362894c875b00ced1b289d18898258.tar.gz
scummvm-rg350-70d5da3bc4362894c875b00ced1b289d18898258.tar.bz2
scummvm-rg350-70d5da3bc4362894c875b00ced1b289d18898258.zip
DEVTOOLS: Link create_kyradat against libcommon.a, for scumm_stricmp
-rw-r--r--devtools/create_kyradat/module.mk3
-rw-r--r--rules.mk5
2 files changed, 6 insertions, 2 deletions
diff --git a/devtools/create_kyradat/module.mk b/devtools/create_kyradat/module.mk
index fb458b43ff..4241f82e34 100644
--- a/devtools/create_kyradat/module.mk
+++ b/devtools/create_kyradat/module.mk
@@ -14,5 +14,8 @@ MODULE_OBJS := \
# Set the name of the executable
TOOL_EXECUTABLE := create_kyradat
+# Link against common code (for scumm_stricmp)
+TOOL_DEPS := common/libcommon.a
+
# Include common rules
include $(srcdir)/rules.mk
diff --git a/rules.mk b/rules.mk
index d03f549405..5ab3754768 100644
--- a/rules.mk
+++ b/rules.mk
@@ -20,11 +20,12 @@ ifdef TOOL_EXECUTABLE
# TODO: Refactor this, so that even our master executable can use this rule?
################################################
TOOL-$(MODULE) := $(MODULE)/$(TOOL_EXECUTABLE)$(EXEEXT)
-$(TOOL-$(MODULE)): $(MODULE_OBJS-$(MODULE))
+$(TOOL-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(TOOL_DEPS)
$(QUIET_CXX)$(CXX) $(LDFLAGS) $+ -o $@
-# Reset TOOL_EXECUTABLE var
+# Reset TOOL_* vars
TOOL_EXECUTABLE:=
+TOOL_DEPS:=
# Add to "devtools" target
devtools: $(TOOL-$(MODULE))