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/src/host/premake.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '3rdparty/genie/src/host/premake.c') diff --git a/3rdparty/genie/src/host/premake.c b/3rdparty/genie/src/host/premake.c index 037f7707fb4..a8ad1140912 100644 --- a/3rdparty/genie/src/host/premake.c +++ b/3rdparty/genie/src/host/premake.c @@ -15,9 +15,9 @@ #define COPYRIGHT \ - "Copyright (c) 2014-2015 Branimir Karadžić, Neil Richardson,\n" \ + "Copyright (c) 2014-2018 Branimir Karadžić, Neil Richardson,\n" \ "Mike Popoloski, Drew Solomon, Ted de Munnik, Miodrag Milanović\n" \ - "Brett Vickers, Terry Hendrix II.\n" \ + "Brett Vickers, Terry Hendrix II, Johan Skoeld.\n" \ "Copyright (C) 2002-2013 Jason Perkins and the Premake Project" #define ERROR_MESSAGE "%s\n" @@ -265,7 +265,7 @@ int process_option(lua_State* L, const char* arg) char* ptr = strchr(arg, '='); if (ptr) { - int len = ptr - arg; + int len = (int)(ptr - arg); if (len > 511) len = 511; strncpy(key, arg, len); key[len] = '\0'; -- cgit v1.2.3-70-g09d2