sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix gmake2 makefile by filtering gmake* instead of gmake 

From a proposition of github.com/tdesveauxPKFX, filter on gmake*
generator instead of gmake so as to add library output directory.

Fixes #155
This commit is contained in:
Alexandre Janniaux 2018-04-02 19:26:56 +02:00 committed by Jérôme Leclercq
parent e8e3c29f37
commit f8d1959d87
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/scripts/common.lua
View File

@ -1,7 +1,7 @@
NazaraBuild = {} NazaraBuild = {}
-- I wish Premake had a way to know the compiler in advance -- I wish Premake had a way to know the compiler in advance
local clangGccActions = "action:" .. table.concat({"codeblocks", "codelite", "gmake", "xcode3", "xcode4"}, " or ") local clangGccActions = "action:" .. table.concat({"codeblocks", "codelite", "gmake*", "xcode3", "xcode4"}, " or ")
function NazaraBuild:AddExecutablePath(path) function NazaraBuild:AddExecutablePath(path)
table.insert(self.ExecutableDir, path) table.insert(self.ExecutableDir, path)
@ -13,16 +13,16 @@ function NazaraBuild:AddInstallPath(path)
end end
function NazaraBuild:FilterLibDirectory(prefix, func) function NazaraBuild:FilterLibDirectory(prefix, func)
filter({"action:codeblocks or codelite or gmake", "architecture:x86", "system:Windows"}) filter({"action:codeblocks or codelite or gmake*", "architecture:x86", "system:Windows"})
func(prefix .. "mingw/x86") func(prefix .. "mingw/x86")
filter({"action:codeblocks or codelite or gmake", "architecture:x86_64", "system:Windows"}) filter({"action:codeblocks or codelite or gmake*", "architecture:x86_64", "system:Windows"})
func(prefix .. "mingw/x64") func(prefix .. "mingw/x64")
filter({"action:codeblocks or codelite or gmake", "architecture:x86", "system:not Windows"}) filter({"action:codeblocks or codelite or gmake*", "architecture:x86", "system:not Windows"})
func(prefix .. "gmake/x86") func(prefix .. "gmake/x86")
filter({"action:codeblocks or codelite or gmake", "architecture:x86_64", "system:not Windows"}) filter({"action:codeblocks or codelite or gmake*", "architecture:x86_64", "system:not Windows"})
func(prefix .. "gmake/x64") func(prefix .. "gmake/x64")
filter({"action:vs*", "architecture:x86"}) filter({"action:vs*", "architecture:x86"})