Fixed resource compiler tool in the C++ Make backend.

This commit is contained in:
triton 2013-09-27 01:52:06 +01:00
parent 5946f73f4c
commit 6e15d08b16
3 changed files with 41 additions and 0 deletions

View File

@ -354,6 +354,11 @@
if tool then
_p(' AR = %s', tool)
end
tool = toolset.gettoolname(cfg, "rc")
if tool then
_p(' RESCOMP = %s', tool)
end
end

View File

@ -0,0 +1,35 @@
--
-- tests/actions/make/cpp/test_tools.lua
-- Tests for tools support in makefiles.
-- Copyright (c) 2012-2013 Jason Perkins and the Premake project
--
local suite = test.declare("make_tools")
local make = premake.make
local cpp = premake.make.cpp
local project = premake.project
--
-- Setup
--
local sln, prj, cfg
function suite.setup()
sln = test.createsolution()
prj = premake.solution.getproject(sln, 1)
cfg = project.getconfig(prj, "Debug")
end
--
-- Make sure that the correct tools are used.
--
function suite.usesCorrectTools()
make.cppTools(cfg, premake.tools.gcc)
test.capture [[
RESCOMP = windres
]]
end

View File

@ -182,6 +182,7 @@
dofile("actions/make/cpp/test_objects.lua")
dofile("actions/make/cpp/test_ps3.lua")
dofile("actions/make/cpp/test_target_rules.lua")
dofile("actions/make/cpp/test_tools.lua")
dofile("actions/make/cpp/test_wiidev.lua")
-- Makefile C# projects