From f8d1959d879d7d5667777fb5d29d9bb0b8e0b461 Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux Date: Mon, 2 Apr 2018 19:26:56 +0200 Subject: [PATCH] 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 --- build/scripts/common.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/scripts/common.lua b/build/scripts/common.lua index f4572322e..750e2211b 100644 --- a/build/scripts/common.lua +++ b/build/scripts/common.lua @@ -1,7 +1,7 @@ NazaraBuild = {} -- 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) table.insert(self.ExecutableDir, path) @@ -13,16 +13,16 @@ function NazaraBuild:AddInstallPath(path) end 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") - 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") - 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") - 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") filter({"action:vs*", "architecture:x86"})