diff --git a/CMakeLists.txt b/CMakeLists.txt index c818700..40bacd9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,3 +62,5 @@ kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) if (NOT WIN32) install(FILES zone.xiv.novus.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) endif() + +install(TARGETS luadec ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index d023a66..8d70e17 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -13,6 +13,7 @@ file (GENERATE #define DATAEXPLORER_EXECUTABLE QStringLiteral(\"$\")\n\ #define ENEMYEDITOR_EXECUTABLE QStringLiteral(\"$\")\n\ #define PATCHDIFF_EXECUTABLE QStringLiteral(\"$\")\n\ +#define LUADEC_EXECUTABLE QStringLiteral(\"$\")\n\ " ) diff --git a/parts/luab/CMakeLists.txt b/parts/luab/CMakeLists.txt index 70bcab9..ad9bccd 100644 --- a/parts/luab/CMakeLists.txt +++ b/parts/luab/CMakeLists.txt @@ -9,7 +9,8 @@ target_link_libraries(luabpart KF6::I18n Physis::Physis Qt6::Core - Qt6::Widgets) + Qt6::Widgets + Novus::Common) if (TARGET KF6::SyntaxHighlighting) target_link_libraries(luabpart PUBLIC diff --git a/parts/luab/luabpart.cpp b/parts/luab/luabpart.cpp index 8d41351..896835d 100644 --- a/parts/luab/luabpart.cpp +++ b/parts/luab/luabpart.cpp @@ -13,6 +13,7 @@ #include #include +#include "launcherconfig.h" #include "scriptprocessor.h" #ifdef HAVE_SYNTAX_HIGHLIGHTING @@ -49,7 +50,7 @@ void LuabPart::load(physis_Buffer buffer) file.close(); QProcess luaDecProcess; - luaDecProcess.setProgram(QStringLiteral("./luadec")); + luaDecProcess.setProgram(LUADEC_EXECUTABLE); luaDecProcess.setArguments({temporaryFile.fileName()}); luaDecProcess.start(); luaDecProcess.waitForFinished();