diff options
author | 2016-06-08 19:36:57 +0200 | |
---|---|---|
committer | 2016-06-08 20:42:23 +0200 | |
commit | e8cb3e06d030cd4a04df0db786081af6436288c2 (patch) | |
tree | 3b1380a952f6d6d2b2617796ab35ec9a96c165e9 /3rdparty/genie/src/base/api.lua | |
parent | b39511102f539a15254316d14a0f98a63afd8fb8 (diff) |
Updated GENie to latest (nw)
Diffstat (limited to '3rdparty/genie/src/base/api.lua')
-rw-r--r-- | 3rdparty/genie/src/base/api.lua | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/3rdparty/genie/src/base/api.lua b/3rdparty/genie/src/base/api.lua index 491a0302697..4eae4a6c6d7 100644 --- a/3rdparty/genie/src/base/api.lua +++ b/3rdparty/genie/src/base/api.lua @@ -84,12 +84,6 @@ scope = "config", }, - debugabsolutedir = - { - kind = "string", - scope = "config", - }, - debugenvs = { kind = "list", @@ -194,6 +188,7 @@ Unicode = 1, Unsafe = 1, UnsignedChar = 1, + UseFullPaths = 1, WinMain = 1, } @@ -297,6 +292,13 @@ usagecopy = true, }, + userincludedirs = + { + kind = "dirlist", + scope = "config", + usagecopy = true, + }, + kind = { kind = "string", @@ -316,7 +318,8 @@ allowed = { "C", "C++", - "C#" + "C#", + "Vala", } }, @@ -645,10 +648,10 @@ end if t == "solution" then - if type(container) == "project" then + if typex(container) == "project" then container = container.solution end - if type(container) ~= "solution" then + if typex(container) ~= "solution" then container = nil end end @@ -1047,19 +1050,19 @@ function usage(name) if (not name) then --Only return usage projects. - if(type(premake.CurrentContainer) ~= "project") then return nil end + if(typex(premake.CurrentContainer) ~= "project") then return nil end if(not premake.CurrentContainer.usage) then return nil end return premake.CurrentContainer end -- identify the parent solution local sln - if (type(premake.CurrentContainer) == "project") then + if (typex(premake.CurrentContainer) == "project") then sln = premake.CurrentContainer.solution else sln = premake.CurrentContainer end - if (type(sln) ~= "solution") then + if (typex(sln) ~= "solution") then error("no active solution", 2) end @@ -1081,19 +1084,19 @@ function project(name) if (not name) then --Only return non-usage projects - if(type(premake.CurrentContainer) ~= "project") then return nil end + if(typex(premake.CurrentContainer) ~= "project") then return nil end if(premake.CurrentContainer.usage) then return nil end return premake.CurrentContainer end -- identify the parent solution local sln - if (type(premake.CurrentContainer) == "project") then + if (typex(premake.CurrentContainer) == "project") then sln = premake.CurrentContainer.solution else sln = premake.CurrentContainer end - if (type(sln) ~= "solution") then + if (typex(sln) ~= "solution") then error("no active solution", 2) end @@ -1113,7 +1116,7 @@ function solution(name) if not name then - if type(premake.CurrentContainer) == "project" then + if typex(premake.CurrentContainer) == "project" then return premake.CurrentContainer.solution else return premake.CurrentContainer |