Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
9167ce10a2 | |||
b6e035aa35 | |||
5fabba42e9 |
@ -454,11 +454,14 @@
|
||||
-- but had trouble linking to certain static libs; $(OBJECTS) moved up
|
||||
-- $(LDFLAGS) moved to end (http://sourceforge.net/p/premake/patches/107/)
|
||||
-- $(LIBS) moved to end (http://sourceforge.net/p/premake/bugs/279/)
|
||||
|
||||
if (os.host() == "windows") then
|
||||
p.outln('LINKCMD = -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)')
|
||||
else
|
||||
local cc = iif(p.languages.isc(cfg.language), "CC", "CXX")
|
||||
p.outln('LINKCMD = $(' .. cc .. ') -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function cpp.bindirs(cfg, toolset)
|
||||
@ -663,10 +666,16 @@
|
||||
targets = targets .. ' $(RESOURCES)'
|
||||
end
|
||||
|
||||
local cc = iif(p.languages.isc(cfg.language), "CC", "CXX")
|
||||
_p('$(TARGET): %s | $(TARGETDIR)', targets)
|
||||
_p('\t$(PRELINKCMDS)')
|
||||
_p('\t@echo Linking %s', cfg.project.name)
|
||||
if (os.host() == "windows") then
|
||||
_p('\t$(file > $(OBJDIR)/linkcmds.cli, $(LINKCMD))')
|
||||
_p('\t$(' .. cc .. ') @$(OBJDIR)/linkcmds.cli')
|
||||
else
|
||||
_p('\t$(SILENT) $(LINKCMD)')
|
||||
end
|
||||
_p('\t$(POSTBUILDCMDS)')
|
||||
_p('')
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user