From 18525f02d8a2bef553f25fa5c235ce7c403d072e Mon Sep 17 00:00:00 2001 From: Ulrich Huber Date: Sat, 23 Feb 2019 12:41:08 +0100 Subject: [PATCH] fix building for lua --- CMakeLists.txt | 2 +- src/plugin/Plugin.cpp | 2 ++ src/plugin/Plugin.h | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e70e27ea..c210383e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,7 +117,7 @@ if (MacIntegration_FOUND) endif () # Plugins / scripting -pkg_check_modules (Lua "lua5.3") +pkg_check_modules (Lua "lua >= 5.3") if (Lua_FOUND) message("Enable Xournal++ Plugins") add_includes_ldflags ("${Lua_LDFLAGS}" "${Lua_INCLUDE_DIRS}") diff --git a/src/plugin/Plugin.cpp b/src/plugin/Plugin.cpp index fddff7d2..8fd36598 100644 --- a/src/plugin/Plugin.cpp +++ b/src/plugin/Plugin.cpp @@ -5,10 +5,12 @@ #ifdef ENABLE_PLUGINS +extern "C" { #include #include #include #include +} #include "luapi_application.h" diff --git a/src/plugin/Plugin.h b/src/plugin/Plugin.h index 2c1d3824..9b559fb3 100644 --- a/src/plugin/Plugin.h +++ b/src/plugin/Plugin.h @@ -18,7 +18,9 @@ #include #ifdef ENABLE_PLUGINS +extern "C" { #include +} class Plugin; class Control;