fix: Compile Lua as a C library (#5251)

This commit is contained in:
pajlada
2024-03-16 15:15:05 +01:00
committed by GitHub
parent 47c46b64ea
commit 3563ecb3a5
10 changed files with 21 additions and 3 deletions
+1
View File
@@ -164,6 +164,7 @@
- Dev: Load less message history upon reconnects. (#5001, #5018) - Dev: Load less message history upon reconnects. (#5001, #5018)
- Dev: Removed the `NullablePtr` class. (#5091) - Dev: Removed the `NullablePtr` class. (#5091)
- Dev: BREAKING: Replace custom `import()` with normal Lua `require()`. (#5014, #5108) - Dev: BREAKING: Replace custom `import()` with normal Lua `require()`. (#5014, #5108)
- Dev: Compile Lua as a C library. (#5251)
- Dev: Fixed most compiler warnings. (#5028, #5137) - Dev: Fixed most compiler warnings. (#5028, #5137)
- Dev: Added the ability to show `ChannelView`s without a `Split`. (#4747) - Dev: Added the ability to show `ChannelView`s without a `Split`. (#4747)
- Dev: Refactor Args to be less of a singleton. (#5041) - Dev: Refactor Args to be less of a singleton. (#5041)
+1 -1
View File
@@ -50,4 +50,4 @@ target_include_directories(lua
PUBLIC PUBLIC
${LUA_INCLUDE_DIRS} ${LUA_INCLUDE_DIRS}
) )
set_source_files_properties(${LUA_SRC} PROPERTIES LANGUAGE CXX) set_source_files_properties(${LUA_SRC} PROPERTIES LANGUAGE C)
+2
View File
@@ -9,9 +9,11 @@
# include "messages/MessageBuilder.hpp" # include "messages/MessageBuilder.hpp"
# include "providers/twitch/TwitchIrcServer.hpp" # include "providers/twitch/TwitchIrcServer.hpp"
extern "C" {
# include <lauxlib.h> # include <lauxlib.h>
# include <lua.h> # include <lua.h>
# include <lualib.h> # include <lualib.h>
}
# include <QFileInfo> # include <QFileInfo>
# include <QLoggingCategory> # include <QLoggingCategory>
# include <QTextCodec> # include <QTextCodec>
+2
View File
@@ -2,7 +2,9 @@
#ifdef CHATTERINO_HAVE_PLUGINS #ifdef CHATTERINO_HAVE_PLUGINS
extern "C" {
# include <lua.h> # include <lua.h>
}
# include <QString> # include <QString>
# include <cassert> # include <cassert>
+2
View File
@@ -7,8 +7,10 @@
# include "controllers/plugins/api/ChannelRef.hpp" # include "controllers/plugins/api/ChannelRef.hpp"
# include "controllers/plugins/LuaAPI.hpp" # include "controllers/plugins/LuaAPI.hpp"
extern "C" {
# include <lauxlib.h> # include <lauxlib.h>
# include <lua.h> # include <lua.h>
}
# include <climits> # include <climits>
# include <cstdlib> # include <cstdlib>
+2
View File
@@ -4,8 +4,10 @@
# include "common/QLogging.hpp" # include "common/QLogging.hpp"
extern "C" {
# include <lua.h> # include <lua.h>
# include <lualib.h> # include <lualib.h>
}
# include <magic_enum/magic_enum.hpp> # include <magic_enum/magic_enum.hpp>
# include <QList> # include <QList>
+2
View File
@@ -4,7 +4,9 @@
# include "common/QLogging.hpp" # include "common/QLogging.hpp"
# include "controllers/commands/CommandController.hpp" # include "controllers/commands/CommandController.hpp"
extern "C" {
# include <lua.h> # include <lua.h>
}
# include <magic_enum/magic_enum.hpp> # include <magic_enum/magic_enum.hpp>
# include <QJsonArray> # include <QJsonArray>
# include <QJsonObject> # include <QJsonObject>
@@ -14,9 +14,11 @@
# include "singletons/Paths.hpp" # include "singletons/Paths.hpp"
# include "singletons/Settings.hpp" # include "singletons/Settings.hpp"
extern "C" {
# include <lauxlib.h> # include <lauxlib.h>
# include <lua.h> # include <lua.h>
# include <lualib.h> # include <lualib.h>
}
# include <QJsonDocument> # include <QJsonDocument>
# include <memory> # include <memory>
@@ -9,8 +9,10 @@
# include "providers/twitch/TwitchChannel.hpp" # include "providers/twitch/TwitchChannel.hpp"
# include "providers/twitch/TwitchIrcServer.hpp" # include "providers/twitch/TwitchIrcServer.hpp"
extern "C" {
# include <lauxlib.h> # include <lauxlib.h>
# include <lua.h> # include <lua.h>
}
# include <cassert> # include <cassert>
# include <memory> # include <memory>
+5 -2
View File
@@ -4,8 +4,11 @@
# include "Application.hpp" # include "Application.hpp"
# include "controllers/plugins/LuaUtilities.hpp" # include "controllers/plugins/LuaUtilities.hpp"
# include "controllers/plugins/PluginController.hpp" # include "controllers/plugins/PluginController.hpp"
# include "lauxlib.h"
# include "lua.h" extern "C" {
# include <lauxlib.h>
# include <lua.h>
}
# include <cerrno> # include <cerrno>