Package: Replace gmake with gmake2 for source package

This commit is contained in:
Thomas Desveaux 2019-05-04 17:16:52 +02:00
parent ca50a00bdf
commit 552c00cbd8
2 changed files with 5 additions and 5 deletions

View File

@ -18,7 +18,7 @@ BUILDING FROM A SOURCE PACKAGE
officially supported toolsets in the build/ folder. Build the release officially supported toolsets in the build/ folder. Build the release
configuration and you will be ready to go. For makefiles: configuration and you will be ready to go. For makefiles:
$ cd build/gmake.unix $ cd build/gmake2.unix
$ make config=release $ make config=release
The binaries will be placed in the ./bin/release directory. The binaries will be placed in the ./bin/release directory.
@ -54,7 +54,7 @@ BUILDING FROM THE REPOSITORY
files for your toolset by running a command like the following in the files for your toolset by running a command like the following in the
top-level Premake directory: top-level Premake directory:
$ premake5 gmake # for makefiles $ premake5 gmake2 # for makefiles
$ premake5 vs2012 # for a Visual Studio 2012 solution $ premake5 vs2012 # for a Visual Studio 2012 solution
$ premake --help # to see a list of supported toolsets $ premake --help # to see a list of supported toolsets

View File

@ -183,9 +183,9 @@ if kind == "source" then
local ignoreActions = { local ignoreActions = {
"clean", "clean",
"embed", "embed",
"gmake2",
"package", "package",
"test", "test",
"gmake", -- deprecated
"codelite", "codelite",
"xcode4", "xcode4",
@ -194,7 +194,7 @@ if kind == "source" then
for action in premake.action.each() do for action in premake.action.each() do
if not table.contains(ignoreActions, action.trigger) then if not table.contains(ignoreActions, action.trigger) then
if action.trigger == "gmake" then if action.trigger == "gmake2" then
local gmakeOsList = { local gmakeOsList = {
{ "windows", }, { "windows", },
@ -205,7 +205,7 @@ if kind == "source" then
for _, os in ipairs(gmakeOsList) do for _, os in ipairs(gmakeOsList) do
local osTarget = os[2] or os[1] local osTarget = os[2] or os[1]
genProjects(string.format("--to=build/gmake.%s --os=%s gmake", os[1], osTarget)) genProjects(string.format("--to=build/gmake2.%s --os=%s gmake2", os[1], osTarget))
end end
else else
genProjects(string.format("--to=build/%s %s", action.trigger, action.trigger)) genProjects(string.format("--to=build/%s %s", action.trigger, action.trigger))