79 lines
2.8 KiB
Diff
79 lines
2.8 KiB
Diff
|
diff -ru avogadro-1.1.1/libavogadro/src/pythonengine_p.h avogadro-1.1.1.patched/libavogadro/src/pythonengine_p.h
|
||
|
|
--- avogadro-1.1.1/libavogadro/src/pythonengine_p.h 2013-12-06 16:50:04.000000000 +0100
|
||
|
|
+++ avogadro-1.1.1.patched/libavogadro/src/pythonengine_p.h 2014-06-14 13:24:44.906052644 +0200
|
||
|
|
@@ -27,7 +27,9 @@
|
||
|
|
|
||
|
|
#include <avogadro/global.h>
|
||
|
|
#include <avogadro/engine.h>
|
||
|
|
+#ifndef Q_MOC_RUN
|
||
|
|
#include <boost/python.hpp>
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
namespace Avogadro {
|
||
|
|
|
||
|
|
diff -ru avogadro-1.1.1/libavogadro/src/pythonextension_p.h avogadro-1.1.1.patched/libavogadro/src/pythonextension_p.h
|
||
|
|
--- avogadro-1.1.1/libavogadro/src/pythonextension_p.h 2013-12-06 16:50:04.000000000 +0100
|
||
|
|
+++ avogadro-1.1.1.patched/libavogadro/src/pythonextension_p.h 2014-06-14 13:26:29.510072837 +0200
|
||
|
|
@@ -29,7 +29,9 @@
|
||
|
|
#include <avogadro/extension.h>
|
||
|
|
#include <avogadro/primitive.h>
|
||
|
|
#include <avogadro/glwidget.h>
|
||
|
|
+#ifndef Q_MOC_RUN
|
||
|
|
#include <boost/python.hpp>
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
#include <QWidget>
|
||
|
|
#include <QList>
|
||
|
|
diff -ru avogadro-1.1.1/libavogadro/src/pythoninterpreter.h avogadro-1.1.1.patched/libavogadro/src/pythoninterpreter.h
|
||
|
|
--- avogadro-1.1.1/libavogadro/src/pythoninterpreter.h 2013-12-06 16:50:04.000000000 +0100
|
||
|
|
+++ avogadro-1.1.1.patched/libavogadro/src/pythoninterpreter.h 2014-06-14 13:27:34.316085348 +0200
|
||
|
|
@@ -26,7 +26,9 @@
|
||
|
|
#define PYTHONINTERPRETER_H
|
||
|
|
|
||
|
|
#include <avogadro/global.h>
|
||
|
|
+#ifndef Q_MOC_RUN
|
||
|
|
#include <boost/python.hpp>
|
||
|
|
+#endif
|
||
|
|
#include <avogadro/primitive.h>
|
||
|
|
#include <QString>
|
||
|
|
|
||
|
|
diff -ru avogadro-1.1.1/libavogadro/src/pythonscript.h avogadro-1.1.1.patched/libavogadro/src/pythonscript.h
|
||
|
|
--- avogadro-1.1.1/libavogadro/src/pythonscript.h 2013-12-06 16:50:04.000000000 +0100
|
||
|
|
+++ avogadro-1.1.1.patched/libavogadro/src/pythonscript.h 2014-06-14 13:27:49.010088184 +0200
|
||
|
|
@@ -27,7 +27,9 @@
|
||
|
|
#define PYTHONSCRIPT_H
|
||
|
|
|
||
|
|
#include <avogadro/global.h>
|
||
|
|
+#ifndef Q_MOC_RUN
|
||
|
|
#include <boost/python.hpp>
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
#include "pythonerror.h"
|
||
|
|
|
||
|
|
diff -ru avogadro-1.1.1/libavogadro/src/pythonthread_p.h avogadro-1.1.1.patched/libavogadro/src/pythonthread_p.h
|
||
|
|
--- avogadro-1.1.1/libavogadro/src/pythonthread_p.h 2013-12-06 16:50:04.000000000 +0100
|
||
|
|
+++ avogadro-1.1.1.patched/libavogadro/src/pythonthread_p.h 2014-06-14 13:28:08.114091872 +0200
|
||
|
|
@@ -26,7 +26,9 @@
|
||
|
|
#define PYTHONTHREAD_H
|
||
|
|
|
||
|
|
#include <avogadro/global.h>
|
||
|
|
+#ifndef Q_MOC_RUN
|
||
|
|
#include <boost/python.hpp>
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
namespace Avogadro {
|
||
|
|
|
||
|
|
diff -ru avogadro-1.1.1/libavogadro/src/pythontool_p.h avogadro-1.1.1.patched/libavogadro/src/pythontool_p.h
|
||
|
|
--- avogadro-1.1.1/libavogadro/src/pythontool_p.h 2013-12-06 16:50:04.000000000 +0100
|
||
|
|
+++ avogadro-1.1.1.patched/libavogadro/src/pythontool_p.h 2014-06-14 13:28:40.003098028 +0200
|
||
|
|
@@ -27,7 +27,9 @@
|
||
|
|
|
||
|
|
#include <avogadro/global.h>
|
||
|
|
#include <avogadro/tool.h>
|
||
|
|
+#ifndef Q_MOC_RUN
|
||
|
|
#include <boost/python.hpp>
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
#include <QObject>
|
||
|
|
#include <QAction>
|