summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/genie/src/actions/make/_make.lua
diff options
context:
space:
mode:
author Julian Sikorski <belegdol+github@gmail.com>2019-09-29 15:30:18 +0200
committer R. Belmont <rb6502@users.noreply.github.com>2019-09-29 09:30:18 -0400
commited2b7e5ef1626c0d6318b6ea71897efbb4356277 (patch)
tree62a84a4a2c804922839dbfa60ec664b84beaaee0 /3rdparty/genie/src/actions/make/_make.lua
parent1bd1288c9e17bdba9544d1e56be7618106fece7e (diff)
Synced with GENie upstream revision e78d6c1 (#5631)
* Synced with GENie upstream revision e78d6c1 * Add Visual Studio 2019 support * Fix hardcoded -m64 * Switch appveyor to Visual Studio 2019 * Fix genie being built as 32-bit * MSVC build is known to be broken currently. Let it fail until all the known issues are fixed. * Update the packages before building * Build with 3 threads Appveyor VMs have only 2 cores and 8 GB RAM. * Enable caching of pacman cache
Diffstat (limited to '3rdparty/genie/src/actions/make/_make.lua')
-rw-r--r--3rdparty/genie/src/actions/make/_make.lua24
1 files changed, 23 insertions, 1 deletions
diff --git a/3rdparty/genie/src/actions/make/_make.lua b/3rdparty/genie/src/actions/make/_make.lua
index 6392ff46ac6..0f1a4b60519 100644
--- a/3rdparty/genie/src/actions/make/_make.lua
+++ b/3rdparty/genie/src/actions/make/_make.lua
@@ -33,6 +33,26 @@
end
end
+--
+-- Escape quoted string so it can be passed as define via command line.
+--
+
+ function _MAKE.escquote(value)
+ local result
+ if (type(value) == "table") then
+ result = { }
+ for _,v in ipairs(value) do
+ table.insert(result, _MAKE.escquote(v))
+ end
+ return result
+ else
+ -- handle simple replacements
+ result = value:gsub(" ", "\\ ")
+ result = result:gsub("\"", "\\\"")
+ return result
+ end
+ end
+
--
-- Rules for file ops based on the shell type. Can't use defines and $@ because
@@ -166,5 +186,7 @@
oncleanproject = function(prj)
premake.clean.file(prj, _MAKE.getmakefilename(prj, true))
- end
+ end,
+
+ gmake = {}
}