Package: Replace gmake with gmake2 for source package
This commit is contained in:
parent
ca50a00bdf
commit
552c00cbd8
@ -18,7 +18,7 @@ BUILDING FROM A SOURCE PACKAGE
|
||||
officially supported toolsets in the build/ folder. Build the release
|
||||
configuration and you will be ready to go. For makefiles:
|
||||
|
||||
$ cd build/gmake.unix
|
||||
$ cd build/gmake2.unix
|
||||
$ make config=release
|
||||
|
||||
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
|
||||
top-level Premake directory:
|
||||
|
||||
$ premake5 gmake # for makefiles
|
||||
$ premake5 gmake2 # for makefiles
|
||||
$ premake5 vs2012 # for a Visual Studio 2012 solution
|
||||
$ premake --help # to see a list of supported toolsets
|
||||
|
||||
|
@ -183,9 +183,9 @@ if kind == "source" then
|
||||
local ignoreActions = {
|
||||
"clean",
|
||||
"embed",
|
||||
"gmake2",
|
||||
"package",
|
||||
"test",
|
||||
"gmake", -- deprecated
|
||||
|
||||
"codelite",
|
||||
"xcode4",
|
||||
@ -194,7 +194,7 @@ if kind == "source" then
|
||||
for action in premake.action.each() do
|
||||
|
||||
if not table.contains(ignoreActions, action.trigger) then
|
||||
if action.trigger == "gmake" then
|
||||
if action.trigger == "gmake2" then
|
||||
|
||||
local gmakeOsList = {
|
||||
{ "windows", },
|
||||
@ -205,7 +205,7 @@ if kind == "source" then
|
||||
|
||||
for _, os in ipairs(gmakeOsList) do
|
||||
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
|
||||
else
|
||||
genProjects(string.format("--to=build/%s %s", action.trigger, action.trigger))
|
||||
|
Loading…
Reference in New Issue
Block a user