Merged in gaz_liddon/premake-dev (pull request #115)
Fixes external library name mangling in gmake makefiles
This commit is contained in:
commit
32fc58eb23
@ -235,7 +235,7 @@
|
||||
elseif path.isobjectfile(link) then
|
||||
table.insert(result, link)
|
||||
else
|
||||
table.insert(result, "-l" .. path.getbasename(link))
|
||||
table.insert(result, "-l" .. path.getname(link))
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -138,4 +138,22 @@
|
||||
ALL_LDFLAGS += $(LDFLAGS) -L../libs -s
|
||||
LIBS += -lSomeLib
|
||||
]]
|
||||
end
|
||||
|
||||
|
||||
|
||||
--
|
||||
-- When referencing an external library with a period in the
|
||||
-- file name make sure it appears correctly in the LIBS
|
||||
-- directive. Currently the period and everything after it
|
||||
-- is stripped
|
||||
--
|
||||
|
||||
function suite.onExternalLibraryWithPath()
|
||||
location "MyProject"
|
||||
links { "libs/SomeLib-1.1" }
|
||||
prepare { "libs", }
|
||||
test.capture [[
|
||||
LIBS += -lSomeLib-1.1
|
||||
]]
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user