summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/genie/src/base/premake.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/base/premake.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/base/premake.lua')
-rw-r--r--3rdparty/genie/src/base/premake.lua16
1 files changed, 10 insertions, 6 deletions
diff --git a/3rdparty/genie/src/base/premake.lua b/3rdparty/genie/src/base/premake.lua
index 8d64d9663c1..c96ef0f2a2a 100644
--- a/3rdparty/genie/src/base/premake.lua
+++ b/3rdparty/genie/src/base/premake.lua
@@ -22,13 +22,18 @@
--
function premake.generate(obj, filename, callback)
+ local prev = io.capture()
+ local abort = (callback(obj) == false)
+ local new = io.endcapture(prev)
+
+ if abort then
+ premake.stats.num_skipped = premake.stats.num_skipped + 1
+ return
+ end
+
filename = premake.project.getfilename(obj, filename)
if (premake._checkgenerate) then
- io.capture()
- callback(obj)
- local new = io.endcapture()
-
local delta = false
local f, err = io.open(filename, "rb")
@@ -69,8 +74,7 @@
error(err, 0)
end
- io.output(f)
- callback(obj)
+ f:write(new)
f:close()
premake.stats.num_generated = premake.stats.num_generated + 1
end