From 84fe2b0307b4dcc21880e2ae629e09b6ae218743 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Mon, 8 Sep 2014 20:37:23 +0200
Subject: [PATCH] - re-enabled building of loot_cli and started developing
 against the new api - extended set of default categories - more tolerand
 bbcode parser - added a few colors for the bbcode parser - more fixes to qt5
 compatibility - started work on ability to unloading (and thus re-loading) of
 plugins - names of plugins are no longer localizable (because those names are
 also used to store settings) - added settings to disable individual diagnosis
 settings - path of dependencies is now configured in a .pri file instead of
 environment variablees - bugfix: if the modid-input is canceled, the id was
 saved as -1 and wasn't re-requested from the user - bugfix: moving files with
 the SHFileOperation-Api didn't update the vfs correctly (still not perfect
 but better) - bugfix: attempt to remove the deleter-file seems to have caused
 error messages for some users - bugfix: fixed a couple of cases that might
 have caused the tutorial to hang

---
 src/proxy/proxyPython.pro        |  2 +-
 src/proxy/proxypython.cpp        |  2 +-
 src/runner/error.cpp             |  2 ++
 src/runner/proxypluginwrappers.h |  1 -
 src/runner/pythonRunner.pro      | 12 +++++++++---
 src/runner/pythonrunner.cpp      |  1 -
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/proxy/proxyPython.pro b/src/proxy/proxyPython.pro
index c8cc51f..eaa3614 100644
--- a/src/proxy/proxyPython.pro
+++ b/src/proxy/proxyPython.pro
@@ -36,7 +36,7 @@ RC_FILE += \
 
 include(../plugin_template.pri)
 
-INCLUDEPATH += "../../pythonRunner" "$(BOOSTPATH)"
+INCLUDEPATH += "../../pythonRunner" "$${BOOSTPATH}"
 
 WINPWD = $$PWD
 WINPWD ~= s,/,$$QMAKE_DIR_SEP,g
diff --git a/src/proxy/proxypython.cpp b/src/proxy/proxypython.cpp
index 0ed3b4b..2592b7f 100644
--- a/src/proxy/proxypython.cpp
+++ b/src/proxy/proxypython.cpp
@@ -164,7 +164,7 @@ bool ProxyPython::init(IOrganizer *moInfo)
 
 QString ProxyPython::name() const
 {
-  return tr("Python Proxy");
+  return "Python Proxy";
 }
 
 QString ProxyPython::author() const
diff --git a/src/runner/error.cpp b/src/runner/error.cpp
index a1ae993..62a2346 100644
--- a/src/runner/error.cpp
+++ b/src/runner/error.cpp
@@ -1,4 +1,6 @@
+#ifndef Q_MOC_RUN
 #include <boost/python.hpp>
+#endif
 #include <QString>
 #include <utility.h>
 
diff --git a/src/runner/proxypluginwrappers.h b/src/runner/proxypluginwrappers.h
index 49e87df..089ce35 100644
--- a/src/runner/proxypluginwrappers.h
+++ b/src/runner/proxypluginwrappers.h
@@ -5,7 +5,6 @@
 #include <iplugintool.h>
 #include <iplugininstallersimple.h>
 #include <iplugininstallercustom.h>
-#include <iplugindiagnose.h>
 
 #ifndef Q_MOC_RUN
 #include <boost/python.hpp>
diff --git a/src/runner/pythonRunner.pro b/src/runner/pythonRunner.pro
index aa11767..dbffac8 100644
--- a/src/runner/pythonRunner.pro
+++ b/src/runner/pythonRunner.pro
@@ -13,7 +13,13 @@ CONFIG += warn_on
 DEFINES += PYTHONRUNNER_LIBRARY
 
 # suppress a few warnings caused by boost vs vc++ paranoia
-DEFINES += _SCL_SECURE_NO_WARNINGS
+DEFINES += _SCL_SECURE_NO_WARNINGS -DHAVE_ROUND
+
+
+!include(../LocalPaths.pri) {
+  message("paths to required libraries need to be set up in LocalPaths.pri")
+}
+
 
 SOURCES += pythonrunner.cpp \
     gilock.cpp \
@@ -36,8 +42,8 @@ CONFIG(debug, debug|release) {
   QMAKE_LFLAGS += /DEBUG
 }
 
-INCLUDEPATH += "$(BOOSTPATH)" "$$(PYTHONPATH)/include" "$$(PYTHONPATH)/Lib/site-packages/PyQt4/include"
-LIBS += -L"$$(PYTHONPATH)/libs" -L"$(BOOSTPATH)/stage/lib"
+INCLUDEPATH += "$${BOOSTPATH}" "$${PYTHONPATH}/include" "$${PYTHONPATH}/Lib/site-packages/PyQt4/include"
+LIBS += -L"$${PYTHONPATH}/libs" -L"$${BOOSTPATH}/stage/lib"
 LIBS += -lpython27
 
 INCLUDEPATH += ../uibase
diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp
index 8c5760c..d79a695 100644
--- a/src/runner/pythonrunner.cpp
+++ b/src/runner/pythonrunner.cpp
@@ -5,7 +5,6 @@
 #pragma warning( disable : 4100 )
 #pragma warning( disable : 4996 )
 
-#include <boost/python.hpp>
 #include <iplugininstaller.h>
 #include "uibasewrappers.h"
 #include "pythonpluginwrapper.h"