Small fix to shut up messages about long boost names

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

@@ -13,6 +13,10 @@ env.AppendUnique(CPPDEFINES = [
     'HAVE_ROUND'
 ])
 
+# Boost produces very long names with msvc truncates. Doesn't seem to cause
+# problems.
+env.AppendUnique(CPPFLAGS = [ '-wd4503' ])
+
 #  QMAKE_CXXFLAGS += /Zi
 #  QMAKE_LFLAGS += /DEBUG
 
@@ -43,8 +47,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 += \

src/runner/pythonrunner.cpp

@@ -773,6 +773,9 @@ BOOST_PYTHON_MODULE(mobase)
       .def("setIsEndorsed", bpy::pure_virtual(&IModInterface::setIsEndorsed))
       .def("setNexusID", bpy::pure_virtual(&IModInterface::setNexusID))
       .def("addNexusCategory", bpy::pure_virtual(&IModInterface::addNexusCategory))
+      .def("addCategory", bpy::pure_virtual(&IModInterface::addCategory))
+      .def("removeCategory", bpy::pure_virtual(&IModInterface::removeCategory))
+      .def("categories", bpy::pure_virtual(&IModInterface::categories))
       .def("setName", bpy::pure_virtual(&IModInterface::setName))
       .def("remove", bpy::pure_virtual(&IModInterface::remove))
       ;

src/runner/uibasewrappers.h

@@ -266,16 +266,19 @@ struct IGameInfoWrapper: MOBase::IGameInfo, boost::python::wrapper<MOBase::IGame
 
 struct IModInterfaceWrapper: MOBase::IModInterface, boost::python::wrapper<MOBase::IModInterface>
 {
-  virtual QString name() const { return this->get_override("name")();  }
-  virtual QString absolutePath() const { return this->get_override("absolutePath")(); }
-  virtual void setVersion(const MOBase::VersionInfo &version) { this->get_override("setVersion")(version); }
-  virtual void setNewestVersion(const MOBase::VersionInfo &version) { this->get_override("setNewestVersion")(version); }
-  virtual void setIsEndorsed(bool endorsed) { this->get_override("setIsEndorsed")(endorsed); }
-  virtual void setNexusID(int nexusID) { this->get_override("setNexusID")(nexusID); }
-  virtual void setInstallationFile(const QString &fileName) { this->get_override("setInstallationFile")(fileName); }
-  virtual void addNexusCategory(int categoryID) { this->get_override("addNexusCategory")(categoryID); }
-  virtual bool setName(const QString &name) { return this->get_override("setName")(name); }
-  virtual bool remove() { return this->get_override("remove")(); }
+  virtual QString name() const override { return this->get_override("name")();  }
+  virtual QString absolutePath() const override { return this->get_override("absolutePath")(); }
+  virtual void setVersion(const MOBase::VersionInfo &version) override { this->get_override("setVersion")(version); }
+  virtual void setNewestVersion(const MOBase::VersionInfo &version) override { this->get_override("setNewestVersion")(version); }
+  virtual void setIsEndorsed(bool endorsed) override { this->get_override("setIsEndorsed")(endorsed); }
+  virtual void setNexusID(int nexusID) override { this->get_override("setNexusID")(nexusID); }
+  virtual void setInstallationFile(const QString &fileName) override { this->get_override("setInstallationFile")(fileName); }
+  virtual void addNexusCategory(int categoryID) override { this->get_override("addNexusCategory")(categoryID); }
+  virtual bool setName(const QString &name) override { return this->get_override("setName")(name); }
+  virtual bool remove() override { return this->get_override("remove")(); }
+  virtual void addCategory(const QString &categoryName) override { this->get_override("addCategory")(categoryName); }
+  virtual bool removeCategory(const QString &categoryName) override { return this->get_override("removeCategory")(categoryName); }
+  virtual QStringList categories() override { return this->get_override("categories")(); }
 };