From a06d8e9cc68e6c91fcd58770e972ff81ffd20275 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Wed, 5 Feb 2020 23:21:10 +0100 Subject: Sync with GENie upstream revision ce9f3c5 (#6262) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 * Set prefer project set as solution.startproject as default target Signed-off-by: Julian Sikorski * Adding `GenerateMapFiles` flag. Causes Visual Studio's linker to generate .map files for that configuration. Signed-off-by: Julian Sikorski * Add ninja support for 'wholearchive' libraries Signed-off-by: Julian Sikorski * Fixup ninja.esc to gracefully ignore nil passed as value Signed-off-by: Julian Sikorski * Use -Wl,-force_load for wholearchive libs when building for macosx Signed-off-by: Julian Sikorski * Updated README. Signed-off-by: Julian Sikorski * Add space after filename in 'Generating' message This makes the filename 'clickable' to open in iTerm and VSCode Signed-off-by: Julian Sikorski * Print generated filenames as quoted string Signed-off-by: Julian Sikorski * Remove '...' after filename Signed-off-by: Julian Sikorski * Pop cwd after pushing to run file Signed-off-by: Julian Sikorski * Make paths in embed.lua rely on script dir Signed-off-by: Julian Sikorski * Updated README. Signed-off-by: Julian Sikorski * 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 * Fixed release script. Signed-off-by: Julian Sikorski * Updated README. Signed-off-by: Julian Sikorski * Update scripts.c Co-authored-by: Christian Helmich Co-authored-by: Johan Sköld Co-authored-by: Бранимир Караџић --- 3rdparty/genie/src/actions/ninja/ninja_solution.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to '3rdparty/genie/src/actions/ninja/ninja_solution.lua') diff --git a/3rdparty/genie/src/actions/ninja/ninja_solution.lua b/3rdparty/genie/src/actions/ninja/ninja_solution.lua index f4979c52826..3d1e400e553 100644 --- a/3rdparty/genie/src/actions/ninja/ninja_solution.lua +++ b/3rdparty/genie/src/actions/ninja/ninja_solution.lua @@ -123,6 +123,7 @@ end function generate(prjcfgs) local cfgs = {} + local cfg_start = nil local cfg_first = nil local cfg_first_lib = nil @@ -142,6 +143,9 @@ end cfgs["all"] = cfgs["all"] .. cfg:getoutputfilename() .. " " -- set first configuration name + if (cfg_start == nil) and (cfg.solution.startproject == key) then + cfg_start = key + end if (cfg_first == nil) and (cfg.kind == "ConsoleApp" or cfg.kind == "WindowedApp") then cfg_first = key end @@ -162,6 +166,6 @@ end _p("") _p("# default target") - _p("default " .. (cfg_first or cfg_first_lib)) + _p("default " .. (cfg_start or cfg_first or cfg_first_lib)) _p("") end -- cgit v1.2.3-70-g09d2