Compare commits

...

3 Commits

2 changed files with 15 additions and 6 deletions

View File

@ -1,6 +1,6 @@
MSDEV = vs2012
MSDEV = vs2022
CONFIG = release
PLATFORM = x86
PLATFORM = x64
LUA_DIR = contrib/lua/src
LUASHIM_DIR = contrib/luashim

View File

@ -454,9 +454,12 @@
-- 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/)
local cc = iif(p.languages.isc(cfg.language), "CC", "CXX")
p.outln('LINKCMD = $(' .. cc .. ') -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)')
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
@ -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)
_p('\t$(SILENT) $(LINKCMD)')
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