[Scummvm-git-logs] scummvm master -> f738e79e2a5dff5feed81834ca84e47aa8dac114

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f738e79e2a BUILD: Fix specifying tool-specific libraries and flags


Commit: f738e79e2a5dff5feed81834ca84e47aa8dac114
    https://github.com/scummvm/scummvm/commit/f738e79e2a5dff5feed81834ca84e47aa8dac114
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-13T13:22:20+02:00

Commit Message:
BUILD: Fix specifying tool-specific libraries and flags

This fixes create_titanic which is now dependent on USE_ZLIB

Changed paths:
    rules.mk


diff --git a/rules.mk b/rules.mk
index 2df8307..0963a46 100644
--- a/rules.mk
+++ b/rules.mk
@@ -20,14 +20,11 @@ ifdef TOOL_EXECUTABLE
 # TODO: Refactor this, so that even our master executable can use this rule?
 ################################################
 TOOL-$(MODULE) := $(MODULE)/$(TOOL_EXECUTABLE)$(EXEEXT)
-TOOL_CFLAGS-$(MODULE) := $(TOOL_CFLAGS)
-TOOL_LIBS-$(MODULE) := $(TOOL_LIBS)
-
-$(TOOL-$(MODULE)): TOOL_LIBS = $(TOOL_LIBS-$(MODULE))
-$(TOOL-$(MODULE)): TOOL_CFLAGS = $(TOOL_CFLAGS-$(MODULE))
+TOOL_LIBS-$(TOOL-$(MODULE)) := $(TOOL_LIBS)
+TOOL_CFLAGS-$(TOOL-$(MODULE)) := $(TOOL_CFLAGS)
 
 $(TOOL-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(TOOL_DEPS)
-	$(QUIET_CXX)$(CXX) $(LDFLAGS) $(TOOL_CFLAGS) $+ $(TOOL_LIBS) -o $@
+	$(QUIET_CXX)$(CXX) $(LDFLAGS) $(TOOL_CFLAGS-$@) $+ $(TOOL_LIBS-$@) -o $@
 
 # Reset TOOL_* vars
 TOOL_EXECUTABLE:=