diff --git a/src/proxy/proxyPython.pro b/src/proxy/proxyPython.pro index e0bd9bd..0458fef 100644 --- a/src/proxy/proxyPython.pro +++ b/src/proxy/proxyPython.pro @@ -29,11 +29,9 @@ HEADERS += proxypython.h \ OTHER_FILES += \ proxypython.json \ - embedrunner.rc\ SConscript -RC_FILE += \ - embedrunner.rc +RC_FILE += include(../plugin_template.pri) diff --git a/src/proxy/proxypython.cpp b/src/proxy/proxypython.cpp index ab749ff..c3bbabc 100644 --- a/src/proxy/proxypython.cpp +++ b/src/proxy/proxypython.cpp @@ -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) { diff --git a/src/runner/pythonRunner.pro b/src/runner/pythonRunner.pro index 47471fc..34c26b7 100644 --- a/src/runner/pythonRunner.pro +++ b/src/runner/pythonRunner.pro @@ -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 += \