diff options
| author | Eugene Sandulenko | 2017-08-13 13:22:20 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-08-13 13:22:20 +0200 |
| commit | f738e79e2a5dff5feed81834ca84e47aa8dac114 (patch) | |
| tree | 0f74f165699e5a2564012b095b9c28a1eb743104 /rules.mk | |
| parent | 933d634c32c3ed3470a082b6d3560e737ef250b1 (diff) | |
| download | scummvm-rg350-f738e79e2a5dff5feed81834ca84e47aa8dac114.tar.gz scummvm-rg350-f738e79e2a5dff5feed81834ca84e47aa8dac114.tar.bz2 scummvm-rg350-f738e79e2a5dff5feed81834ca84e47aa8dac114.zip | |
BUILD: Fix specifying tool-specific libraries and flags
This fixes create_titanic which is now dependent on USE_ZLIB
Diffstat (limited to 'rules.mk')
| -rw-r--r-- | rules.mk | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -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:= |