From bafbd64bdec15aa6d9c888473045977531998b07 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 10 May 2021 16:25:18 +0300 Subject: [PATCH 46/46] Include headers with tolua_*_open() with <> That makes meson based build to find correct header from the build directory first, and not the autotools based build generated version from the source directory. See osdn #42212 Signed-off-by: Marko Lindqvist --- client/luascript/script_client.c | 2 +- server/scripting/script_fcdb.c | 2 +- server/scripting/script_server.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/luascript/script_client.c b/client/luascript/script_client.c index 0a663c98c1..a592c5df58 100644 --- a/client/luascript/script_client.c +++ b/client/luascript/script_client.c @@ -44,7 +44,7 @@ #include "luaconsole_common.h" /* client/luascript */ -#include "tolua_client_gen.h" +#include /* <> so looked from the build directory first. */ #include "script_client.h" diff --git a/server/scripting/script_fcdb.c b/server/scripting/script_fcdb.c index 08fad85ded..fed5a9d12b 100644 --- a/server/scripting/script_fcdb.c +++ b/server/scripting/script_fcdb.c @@ -59,7 +59,7 @@ /* server/scripting */ #ifdef HAVE_FCDB -#include "tolua_fcdb_gen.h" +#include /* <> so looked from the build directory first. */ #endif /* HAVE_FCDB */ #include "script_fcdb.h" diff --git a/server/scripting/script_server.c b/server/scripting/script_server.c index 3b6a553097..3be8b70b48 100644 --- a/server/scripting/script_server.c +++ b/server/scripting/script_server.c @@ -47,7 +47,7 @@ #include "stdinhand.h" /* server/scripting */ -#include "tolua_server_gen.h" +#include /* <> so looked from the build directory first. */ #include "script_server.h" -- 2.30.2