summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/genie/scripts/genie.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/scripts/genie.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/scripts/genie.lua')
-rw-r--r--3rdparty/genie/scripts/genie.lua28
1 files changed, 15 insertions, 13 deletions
diff --git a/3rdparty/genie/scripts/genie.lua b/3rdparty/genie/scripts/genie.lua
index 144b5cf3709..7e64ad9a68a 100644
--- a/3rdparty/genie/scripts/genie.lua
+++ b/3rdparty/genie/scripts/genie.lua
@@ -21,10 +21,11 @@
language "C"
kind "ConsoleApp"
flags {
- "No64BitChecks",
"ExtraWarnings",
+ "No64BitChecks",
"StaticRuntime"
}
+
includedirs {
"../src/host/lua-5.3.0/src"
}
@@ -44,6 +45,10 @@
"../src/host/lua-5.3.0/etc/*.c",
}
+ buildoptions {
+ "-m64",
+ }
+
configuration "Debug"
defines { "_DEBUG", "LUA_COMPAT_MODULE" }
flags { "Symbols" }
@@ -66,16 +71,11 @@
configuration "bsd"
targetdir "../bin/bsd"
- configuration "solaris"
- targetdir "../bin/solaris"
- defines { "_REENTRANT" }
- buildoptions { "-std=gnu99" }
- links { "dl" }
-
- configuration "linux or bsd or solaris"
- defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
- links { "m" }
- linkoptions { "-rdynamic" }
+ configuration "linux or bsd"
+ defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
+ buildoptions { "-Wno-implicit-fallthrough" }
+ links { "m" }
+ linkoptions { "-rdynamic" }
configuration "macosx"
targetdir "../bin/darwin"
@@ -83,8 +83,10 @@
links { "CoreServices.framework" }
configuration { "macosx", "gmake" }
- buildoptions { "-mmacosx-version-min=10.4" }
- linkoptions { "-mmacosx-version-min=10.4" }
+ buildoptions { "-mmacosx-version-min=10.6" }
+ linkoptions { "-mmacosx-version-min=10.6" }
+
+ configuration {}
--