Update scons build

src/proxy/SConscript

@@ -22,12 +22,9 @@ runner = env.File(os.path.join('..', '..', 'pythonRunner', 'pythonRunner.dll'))
 runner_env = env.Clone()
 runner_env.AppendUnique(CPPDEFINES = 'SCONS_BUILD')
 runner_env.AppendUnique(CPPPATH = runner.dir)
-rc = runner_env.RES('embedrunner.rc')
-# Make sure we have the proper dependencies so it gets built
-runner_env.Depends(rc, runner)
 
 # There's a whole load of unused C++ files in here.
-lib = env.SharedLibrary('proxyPython', [ 'proxypython.cpp' ] + rc)
+lib = env.SharedLibrary('proxyPython', [ 'proxypython.cpp' ])
 
 env.InstallModule(lib)
 

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)
 

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) {

src/runner/SConscript

@@ -43,8 +43,7 @@ cpp_files = [
 
 lib = env.SharedLibrary('pythonRunner', cpp_files + targets)
 
-#This is referred to from inside a resource file. We don't install it.
-#env.InstallModule(lib)
+env.InstallModule(lib, 'plugins/data')
 
 # However...
 # we do need boost-python and pythonvv.dll and pythonvv.zip (though the last

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 += \