diff options
author | 2020-02-05 23:21:10 +0100 | |
---|---|---|
committer | 2020-02-06 12:49:15 +1100 | |
commit | 1a5ac25f6108ffb46058c68fda9f53ce97610d9a (patch) | |
tree | e2ac5cbc1b14d1da002d0472055a02971f9919c2 /3rdparty/genie/src/actions/ninja/ninja_base.lua | |
parent | e8e3d668c94fbca1b945e32529727c472cb7283c (diff) |
Sync with GENie upstream revision ce9f3c5 (#6262)
* Change makerules to take variable $(PROJECT_TYPE) instead of hardcoded 'gmake'
This allows to run `make projgen PROJECT_TYPE=ninja` to generate ninja build files instead.
and to build GENie using ninja by running `make release PROJECT_TYPE=ninja`.
Using ninja improves build times,
e.g. for macOS: 12.47s with gmake goes down to 2.05s with ninja.
Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>
* Set prefer project set as solution.startproject as default target
Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>
* Adding `GenerateMapFiles` flag.
Causes Visual Studio's linker to generate .map files for that
configuration.
Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>
* Add ninja support for 'wholearchive' libraries
Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>
* Fixup ninja.esc to gracefully ignore nil passed as value
Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>
* Use -Wl,-force_load for wholearchive libs when building for macosx
Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>
* Updated README.
Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>
* Add space after filename in 'Generating' message
This makes the filename 'clickable' to open in iTerm and VSCode
Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>
* Print generated filenames as quoted string
Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>
* Remove '...' after filename
Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>
* Pop cwd after pushing to run file
Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>
* Make paths in embed.lua rely on script dir
Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>
* Updated README.
Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>
* Fix issues caused by make-4.3 no longer adding spaces to variables in some cases The fix was found by @asavah.
Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>
* Fixed release script.
Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>
* Updated README.
Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>
* Update scripts.c
Co-authored-by: Christian Helmich <kagekirin@gmail.com>
Co-authored-by: Johan Sköld <johan@skold.cc>
Co-authored-by: Бранимир Караџић <branimirkaradzic@gmail.com>
Diffstat (limited to '3rdparty/genie/src/actions/ninja/ninja_base.lua')
-rw-r--r-- | 3rdparty/genie/src/actions/ninja/ninja_base.lua | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/3rdparty/genie/src/actions/ninja/ninja_base.lua b/3rdparty/genie/src/actions/ninja/ninja_base.lua index c4a174f306e..499089d6cc6 100644 --- a/3rdparty/genie/src/actions/ninja/ninja_base.lua +++ b/3rdparty/genie/src/actions/ninja/ninja_base.lua @@ -7,10 +7,12 @@ local ninja = premake.ninja function ninja.esc(value) - value = value:gsub("%$", "$$") -- TODO maybe there is better way - value = value:gsub(":", "$:") - value = value:gsub("\n", "$\n") - value = value:gsub(" ", "$ ") + if value then + value = string.gsub(value, "%$", "$$") -- TODO maybe there is better way + value = string.gsub(value, ":", "$:") + value = string.gsub(value, "\n", "$\n") + value = string.gsub(value, " ", "$ ") + end return value end |