From ed2b7e5ef1626c0d6318b6ea71897efbb4356277 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Sun, 29 Sep 2019 15:30:18 +0200 Subject: 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 --- 3rdparty/genie/scripts/genie.lua | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to '3rdparty/genie/scripts/genie.lua') 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 {} -- -- cgit v1.2.3-70-g09d2