diff options
author | 2019-09-29 15:30:18 +0200 | |
---|---|---|
committer | 2019-09-29 09:30:18 -0400 | |
commit | ed2b7e5ef1626c0d6318b6ea71897efbb4356277 (patch) | |
tree | 62a84a4a2c804922839dbfa60ec664b84beaaee0 /3rdparty/genie/src/base/config.lua | |
parent | 1bd1288c9e17bdba9544d1e56be7618106fece7e (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/base/config.lua')
-rw-r--r-- | 3rdparty/genie/src/base/config.lua | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/3rdparty/genie/src/base/config.lua b/3rdparty/genie/src/base/config.lua index a27d7f2ac19..eec1ad67499 100644 --- a/3rdparty/genie/src/base/config.lua +++ b/3rdparty/genie/src/base/config.lua @@ -64,22 +64,43 @@ -- function premake.config.isincrementallink(cfg) - if cfg.kind == "StaticLib" - or config.isoptimizedbuild(cfg.flags) - or cfg.flags.NoIncrementalLink then + if cfg.kind == "StaticLib" then return false end - return true + return not config.islinkeroptimizedbuild(cfg.flags) and not cfg.flags.NoIncrementalLink end -- -- Determine if this configuration uses one of the optimize flags. --- Optimized builds get different treatment, such as full linking --- instead of incremental. -- function premake.config.isoptimizedbuild(flags) return flags.Optimize or flags.OptimizeSize or flags.OptimizeSpeed end + +-- +-- Determine if this configuration uses one of the optimize flags. +-- Optimized builds get different treatment, such as full linking +-- instead of incremental. +-- + + function premake.config.islinkeroptimizedbuild(flags) + return config.isoptimizedbuild(flags) and not flags.NoOptimizeLink + end + + +-- +-- Determines if this configuration uses edit and continue. +-- + + function premake.config.iseditandcontinue(cfg) + if cfg.flags.NoEditAndContinue + or cfg.flags.Managed + or (cfg.kind ~= "StaticLib" and not config.isincrementallink(cfg)) + or config.islinkeroptimizedbuild(cfg.flags) then + return false + end + return true + end |