mo2/modorganizer-plugin_python
0
0
Fork 0
mirror of https://github.com/ModOrganizer2/modorganizer-plugin_python.git synced 2026-07-27 14:03:33 -07:00
Code Issues Packages Projects Releases Wiki Activity

python runner is now bundled with MO as a separate file instead of embedded in the plugin

Browse Source
This commit is contained in:
Tannin
2015-05-24 18:44:57 +02:00
parent a5901d7975
commit 25d9ad16c2
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/proxy/proxyPython.pro
+1 -3
View File
@@ -29,11 +29,9 @@ HEADERS += proxypython.h \
OTHER_FILES += \
proxypython.json \
embedrunner.rc\
SConscript
RC_FILE += \
embedrunner.rc
RC_FILE +=
include(../plugin_template.pri)
src/proxy/proxypython.cpp
+3 -2
View File
@@ -135,8 +135,9 @@ bool ProxyPython::init(IOrganizer *moInfo)
return true;
}
m_TempRunnerFile = ExtractResource(IDR_LOADER_DLL, "__pythonRunner.dll");
m_RunnerLib = ::LoadLibraryW(ToWString(m_TempRunnerFile).c_str());
//m_TempRunnerFile = ExtractResource(IDR_LOADER_DLL, "__pythonRunner.dll");
//m_RunnerLib = ::LoadLibraryW(ToWString(m_TempRunnerFile).c_str());
m_RunnerLib = ::LoadLibraryW(QDir::toNativeSeparators(m_MOInfo->pluginDataPath() + "/pythonRunner.dll").toStdWString().c_str());
if (m_RunnerLib != nullptr) {
CreatePythonRunner_func CreatePythonRunner = (CreatePythonRunner_func)::GetProcAddress(m_RunnerLib, "CreatePythonRunner");
if (CreatePythonRunner == nullptr) {
src/runner/pythonRunner.pro
+1
View File
@@ -57,6 +57,7 @@ CONFIG(debug, debug|release) {
SRCDIR ~= s,/,$$QMAKE_DIR_SEP,g
DSTDIR ~= s,/,$$QMAKE_DIR_SEP,g
QMAKE_POST_LINK += xcopy /y /s /i $$quote($$SRCDIR\\$${TARGET}*.dll) $$quote($$DSTDIR)\\plugins\\data $$escape_expand(\\n)
QMAKE_POST_LINK += xcopy /y /I $$quote($$SRCDIR\\$${TARGET}*.pdb) $$quote($$DSTDIR)\\plugins $$escape_expand(\\n)
OTHER_FILES += \