summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/3rd/Cocos4.0/config.json2
-rw-r--r--meta/3rd/Defold/config.json2
-rw-r--r--meta/3rd/Jass/config.json2
-rw-r--r--meta/3rd/OpenResty/config.json2
-rw-r--r--meta/3rd/busted/config.json2
-rw-r--r--meta/3rd/example/config.json2
-rw-r--r--meta/3rd/lfs/config.json2
-rw-r--r--meta/3rd/love2d/config.json2
-rw-r--r--meta/3rd/lovr/config.json2
-rw-r--r--script/library.lua4
10 files changed, 11 insertions, 11 deletions
diff --git a/meta/3rd/Cocos4.0/config.json b/meta/3rd/Cocos4.0/config.json
index 6330efb7..a967b6ff 100644
--- a/meta/3rd/Cocos4.0/config.json
+++ b/meta/3rd/Cocos4.0/config.json
@@ -1,7 +1,7 @@
{
"name": "Cocos",
"files": ["cocos"],
- "config": {
+ "settings": {
"Lua.runtime.version": "LuaJIT"
}
}
diff --git a/meta/3rd/Defold/config.json b/meta/3rd/Defold/config.json
index 5e0ea371..5ab875d9 100644
--- a/meta/3rd/Defold/config.json
+++ b/meta/3rd/Defold/config.json
@@ -1,7 +1,7 @@
{
"name" : "Defold",
"files" : ["game.project", "*%.script", "*%.gui_script"],
- "config" : {
+ "settings" : {
"Lua.runtime.version" : "Lua 5.1",
"Lua.workspace.library" : [".internal"],
"Lua.workspace.ignoreDir" : [".internal"],
diff --git a/meta/3rd/Jass/config.json b/meta/3rd/Jass/config.json
index 512713f9..1bbb0c7c 100644
--- a/meta/3rd/Jass/config.json
+++ b/meta/3rd/Jass/config.json
@@ -1,6 +1,6 @@
{
"words" : ["jass%.common"],
- "config" : {
+ "settings" : {
"Lua.runtime.version": "Lua 5.3"
}
}
diff --git a/meta/3rd/OpenResty/config.json b/meta/3rd/OpenResty/config.json
index 91717cc9..39d495fc 100644
--- a/meta/3rd/OpenResty/config.json
+++ b/meta/3rd/OpenResty/config.json
@@ -10,7 +10,7 @@
"resty%.%w+",
"ngx%.%w+"
],
- "config" : {
+ "settings" : {
"Lua.runtime.version" : "LuaJIT",
"Lua.diagnostics.globals" : [
"ngx"
diff --git a/meta/3rd/busted/config.json b/meta/3rd/busted/config.json
index e547d0bd..d91b2627 100644
--- a/meta/3rd/busted/config.json
+++ b/meta/3rd/busted/config.json
@@ -1,5 +1,5 @@
{
- "config": {
+ "settings": {
"Lua.workspace.library": [
"${3rd}/luassert/library"
]
diff --git a/meta/3rd/example/config.json b/meta/3rd/example/config.json
index 415b92b2..79170468 100644
--- a/meta/3rd/example/config.json
+++ b/meta/3rd/example/config.json
@@ -6,7 +6,7 @@
// list or matched file names. `.lua`, `.dll` and `.so` only
"files" : ["thisIsAnExampleFile%.ifItExistsInWorkSpace%.thenTryLoadThisLibrary%.lua"],
// lsit of settings to be changed
- "config" : {
+ "settings" : {
"Lua.runtime.version" : "LuaJIT",
"Lua.diagnostics.globals" : [
"global1",
diff --git a/meta/3rd/lfs/config.json b/meta/3rd/lfs/config.json
index 3784f0c9..b7400123 100644
--- a/meta/3rd/lfs/config.json
+++ b/meta/3rd/lfs/config.json
@@ -1,7 +1,7 @@
{
"name" : "luafilesystem",
"words" : [ "require[%s%(\"']+lfs[%)\"']" ],
- "config" : {
+ "settings" : {
"Lua.diagnostics.globals" : [
"lfs"
]
diff --git a/meta/3rd/love2d/config.json b/meta/3rd/love2d/config.json
index 30862a97..ccb483b3 100644
--- a/meta/3rd/love2d/config.json
+++ b/meta/3rd/love2d/config.json
@@ -1,7 +1,7 @@
{
"name" : "LÖVE",
"words" : ["love%.%w+"],
- "config" : {
+ "settings" : {
"Lua.runtime.version" : "LuaJIT"
}
}
diff --git a/meta/3rd/lovr/config.json b/meta/3rd/lovr/config.json
index d28e6bf9..195c7661 100644
--- a/meta/3rd/lovr/config.json
+++ b/meta/3rd/lovr/config.json
@@ -1,7 +1,7 @@
{
"name" : "LÖVR",
"words" : ["lovr%.%w+"],
- "config" : {
+ "settings" : {
"Lua.runtime.version" : "LuaJIT"
}
}
diff --git a/script/library.lua b/script/library.lua
index cddc8834..0104189d 100644
--- a/script/library.lua
+++ b/script/library.lua
@@ -352,8 +352,8 @@ end
local function apply3rd(uri, cfg, onlyMemory)
local changes = {}
- if cfg.config then
- for key, value in pairs(cfg.config) do
+ if cfg.settings then
+ for key, value in pairs(cfg.settings) do
if type(value) == 'table' then
if #value == 0 then
for k, v in pairs(value) do