AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Compare commits

base: AuroraPipeline:asdawdads
Branches Tags
AuroraPipeline:master
AuroraPipeline:asdawdads
...
compare: AuroraPipeline:master
Branches Tags
AuroraPipeline:master
AuroraPipeline:asdawdads

3 Commits
asdawdads ... master

Author SHA1 Message Date
J Reece Wilson
9167ce10a2 linux regression 2024-02-23 11:34:06 +00:00
Jamie Reece Wilson
b6e035aa35 [*] bypass cmd limits when linking 2023-12-19 05:12:51 +00:00
Reece
5fabba42e9 [*] as i said, morons 4k commits into their project without: x64 bit builds on their primary platform; clang and gcc support under the umbrella of stated "xcode support"; and GNU Makefile support that isn't untested blizzard code from yesteryear 2023-12-19 05:08:13 +00:00
2 changed files with 15 additions and 6 deletions
Show Stats Expand all files Collapse all files

4
Bootstrap.mak
View File

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

17
modules/gmake2/gmake2_cpp.lua
View File

@ -454,9 +454,12 @@
-- but had trouble linking to certain static libs; $(OBJECTS) moved up -- but had trouble linking to certain static libs; $(OBJECTS) moved up
-- $(LDFLAGS) moved to end (http://sourceforge.net/p/premake/patches/107/) -- $(LDFLAGS) moved to end (http://sourceforge.net/p/premake/patches/107/)
-- $(LIBS) moved to end (http://sourceforge.net/p/premake/bugs/279/) -- $(LIBS) moved to end (http://sourceforge.net/p/premake/bugs/279/)
if (os.host() == "windows") then
local cc = iif(p.languages.isc(cfg.language), "CC", "CXX") p.outln('LINKCMD = -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)')
p.outln('LINKCMD = $(' .. cc .. ') -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
end end
@ -663,10 +666,16 @@
targets = targets .. ' $(RESOURCES)' targets = targets .. ' $(RESOURCES)'
end end
local cc = iif(p.languages.isc(cfg.language), "CC", "CXX")
_p('$(TARGET): %s | $(TARGETDIR)', targets) _p('$(TARGET): %s | $(TARGETDIR)', targets)
_p('\t$(PRELINKCMDS)') _p('\t$(PRELINKCMDS)')
_p('\t@echo Linking %s', cfg.project.name) _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('\t$(POSTBUILDCMDS)')
_p('') _p('')
end end