Skip to content

Commit

Permalink
Package: Replace gmake with gmake2 for source package
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Desveaux committed May 4, 2019
1 parent ca50a00 commit 552c00c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions BUILD.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions scripts/package.lua
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@ if kind == "source" then
local ignoreActions = {
"clean",
"embed",
"gmake2",
"package",
"test",
"gmake", -- deprecated

"codelite",
"xcode4",
Expand All @@ -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", },
Expand All @@ -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))
Expand Down

0 comments on commit 552c00c

Please sign in to comment.