Merge pull request #817 from premake/tvandijck-patch-gmake2-preload
A few gmake2 fixes due to it moving into a module.
This commit is contained in:
commit
b1b8ccf0d8
@ -9,6 +9,7 @@
|
||||
--
|
||||
|
||||
local p = premake
|
||||
local project = p.project
|
||||
|
||||
newaction {
|
||||
trigger = "gmake2",
|
||||
@ -25,6 +26,7 @@
|
||||
},
|
||||
|
||||
onInitialize = function()
|
||||
require("gmake2")
|
||||
p.modules.gmake2.cpp.initialize()
|
||||
end,
|
||||
|
||||
@ -43,7 +45,7 @@
|
||||
else
|
||||
if project.isdotnet(prj) then
|
||||
p.generate(prj, makefile, p.modules.gmake2.cs.generate)
|
||||
elseif project.iscpp(prj) then
|
||||
elseif project.isc(prj) or project.iscpp(prj) then
|
||||
p.generate(prj, makefile, p.modules.gmake2.cpp.generate)
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user