AuroraPipeline/fuck-premake-old2
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

[gmake] allow mixing c files in cpp projects

Browse Source
This commit is contained in:
Alexey Orlov 2013-05-01 01:07:38 +03:00
parent 8d76cc55dd
commit 7ba07a2907
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/actions/make/make_cpp.lua
View File

@ -142,8 +142,9 @@
-- Build command for a single file.
--
function cpp.buildcommand(prj, objext)
local flags = iif(prj.language == "C", '$(CC) $(ALL_CFLAGS)', '$(CXX) $(ALL_CXXFLAGS)')
function cpp.buildcommand(prj, objext, is_cfile_)
local is_cfile = is_cfile_ and is_cfile_ or false
local flags = iif(prj.language == "C" or is_cfile, '$(CC) $(ALL_CFLAGS)', '$(CXX) $(ALL_CXXFLAGS)')
_p('\t$(SILENT) %s -o "$@" -MF $(@:%%.%s=%%.d) -c "$<"', flags, objext)
end
@ -184,7 +185,7 @@
local objectname = project.getfileobject(prj, node.abspath)
_p('$(OBJDIR)/%s.o: %s', make.esc(objectname), make.esc(node.relpath))
_p('\t@echo $(notdir $<)')
cpp.buildcommand(prj, "o")
cpp.buildcommand(prj, "o", path.iscfile(node.abspath))
-- resource file
elseif path.isresourcefile(node.abspath) then