From 1a5ac25f6108ffb46058c68fda9f53ce97610d9a 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/make/make_cpp.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '3rdparty/genie/src/actions/make/make_cpp.lua') diff --git a/3rdparty/genie/src/actions/make/make_cpp.lua b/3rdparty/genie/src/actions/make/make_cpp.lua index a4e92521bdc..880d9d35bf2 100644 --- a/3rdparty/genie/src/actions/make/make_cpp.lua +++ b/3rdparty/genie/src/actions/make/make_cpp.lua @@ -73,8 +73,8 @@ if (prj.kind == "StaticLib" and prj.options.ArchiveSplit) then _p('define max_args') _p('\t$(eval _args:=)') - _p('\t$(foreach obj,$3,$(eval _args+=$(obj))$(if $(word $2,$(_args)),$1$(_args)$(EOL)$(eval _args:=)))') - _p('\t$(if $(_args),$1$(_args))') + _p('\t$(foreach obj,$3,$(eval _args+=$(obj))$(if $(word $2,$(_args)),$1 $(_args)$(EOL)$(eval _args:=)))') + _p('\t$(if $(_args),$1 $(_args))') _p('endef') _p('') _p('define EOL') -- cgit v1.2.3-70-g09d2