|
Rex Dieter |
b66069f |
diff -up avogadro-1.1.1/libavogadro/src/pythonengine_p.h.Q_MOC_RUN avogadro-1.1.1/libavogadro/src/pythonengine_p.h
|
|
Rex Dieter |
b66069f |
--- avogadro-1.1.1/libavogadro/src/pythonengine_p.h.Q_MOC_RUN 2013-12-06 09:50:04.000000000 -0600
|
|
Rex Dieter |
7df3fbf |
+++ avogadro-1.1.1/libavogadro/src/pythonengine_p.h 2016-01-25 13:29:52.576196449 -0600
|
|
Rex Dieter |
68f1226 |
@@ -27,7 +27,9 @@
|
|
Rex Dieter |
68f1226 |
|
|
Rex Dieter |
68f1226 |
#include <avogadro/global.h>
|
|
Rex Dieter |
68f1226 |
#include <avogadro/engine.h>
|
|
Rex Dieter |
68f1226 |
+#ifndef Q_MOC_RUN
|
|
Rex Dieter |
68f1226 |
#include <boost/python.hpp>
|
|
Rex Dieter |
68f1226 |
+#endif
|
|
Rex Dieter |
68f1226 |
|
|
Rex Dieter |
68f1226 |
namespace Avogadro {
|
|
Rex Dieter |
68f1226 |
|
|
Rex Dieter |
b66069f |
diff -up avogadro-1.1.1/libavogadro/src/pythonextension_p.h.Q_MOC_RUN avogadro-1.1.1/libavogadro/src/pythonextension_p.h
|
|
Rex Dieter |
b66069f |
--- avogadro-1.1.1/libavogadro/src/pythonextension_p.h.Q_MOC_RUN 2013-12-06 09:50:04.000000000 -0600
|
|
Rex Dieter |
7df3fbf |
+++ avogadro-1.1.1/libavogadro/src/pythonextension_p.h 2016-01-25 13:29:52.576196449 -0600
|
|
Rex Dieter |
b66069f |
@@ -29,7 +29,9 @@
|
|
Rex Dieter |
b66069f |
#include <avogadro/extension.h>
|
|
Rex Dieter |
b66069f |
#include <avogadro/primitive.h>
|
|
Rex Dieter |
b66069f |
#include <avogadro/glwidget.h>
|
|
Rex Dieter |
b66069f |
+#ifndef Q_MOC_RUN
|
|
Rex Dieter |
b66069f |
#include <boost/python.hpp>
|
|
Rex Dieter |
b66069f |
+#endif
|
|
Rex Dieter |
b66069f |
|
|
Rex Dieter |
b66069f |
#include <QWidget>
|
|
Rex Dieter |
b66069f |
#include <QList>
|
|
Rex Dieter |
7df3fbf |
diff -up avogadro-1.1.1/libavogadro/src/pythoninterpreter.h.Q_MOC_RUN avogadro-1.1.1/libavogadro/src/pythoninterpreter.h
|
|
Rex Dieter |
7df3fbf |
--- avogadro-1.1.1/libavogadro/src/pythoninterpreter.h.Q_MOC_RUN 2013-12-06 09:50:04.000000000 -0600
|
|
Rex Dieter |
7df3fbf |
+++ avogadro-1.1.1/libavogadro/src/pythoninterpreter.h 2016-01-25 13:34:36.911051943 -0600
|
|
Rex Dieter |
7df3fbf |
@@ -26,7 +26,9 @@
|
|
Rex Dieter |
7df3fbf |
#define PYTHONINTERPRETER_H
|
|
Rex Dieter |
7df3fbf |
|
|
Rex Dieter |
7df3fbf |
#include <avogadro/global.h>
|
|
Rex Dieter |
7df3fbf |
+#ifndef Q_MOC_RUN
|
|
Rex Dieter |
7df3fbf |
#include <boost/python.hpp>
|
|
Rex Dieter |
7df3fbf |
+#endif
|
|
Rex Dieter |
7df3fbf |
#include <avogadro/primitive.h>
|
|
Rex Dieter |
7df3fbf |
#include <QString>
|
|
Rex Dieter |
7df3fbf |
|
|
Rex Dieter |
7df3fbf |
diff -up avogadro-1.1.1/libavogadro/src/pythonscript.h.Q_MOC_RUN avogadro-1.1.1/libavogadro/src/pythonscript.h
|
|
Rex Dieter |
7df3fbf |
--- avogadro-1.1.1/libavogadro/src/pythonscript.h.Q_MOC_RUN 2013-12-06 09:50:04.000000000 -0600
|
|
Rex Dieter |
7df3fbf |
+++ avogadro-1.1.1/libavogadro/src/pythonscript.h 2016-01-25 13:34:27.048952883 -0600
|
|
Rex Dieter |
7df3fbf |
@@ -27,7 +27,9 @@
|
|
Rex Dieter |
7df3fbf |
#define PYTHONSCRIPT_H
|
|
Rex Dieter |
7df3fbf |
|
|
Rex Dieter |
7df3fbf |
#include <avogadro/global.h>
|
|
Rex Dieter |
7df3fbf |
+#ifndef Q_MOC_RUN
|
|
Rex Dieter |
7df3fbf |
#include <boost/python.hpp>
|
|
Rex Dieter |
7df3fbf |
+#endif
|
|
Rex Dieter |
7df3fbf |
|
|
Rex Dieter |
7df3fbf |
#include "pythonerror.h"
|
|
Rex Dieter |
7df3fbf |
|
|
Rex Dieter |
b66069f |
diff -up avogadro-1.1.1/libavogadro/src/pythontool_p.h.Q_MOC_RUN avogadro-1.1.1/libavogadro/src/pythontool_p.h
|
|
Rex Dieter |
b66069f |
--- avogadro-1.1.1/libavogadro/src/pythontool_p.h.Q_MOC_RUN 2013-12-06 09:50:04.000000000 -0600
|
|
Rex Dieter |
7df3fbf |
+++ avogadro-1.1.1/libavogadro/src/pythontool_p.h 2016-01-25 13:29:52.576196449 -0600
|
|
Rex Dieter |
b66069f |
@@ -27,7 +27,9 @@
|
|
Rex Dieter |
b66069f |
|
|
Rex Dieter |
b66069f |
#include <avogadro/global.h>
|
|
Rex Dieter |
b66069f |
#include <avogadro/tool.h>
|
|
Rex Dieter |
b66069f |
+#ifndef Q_MOC_RUN
|
|
Rex Dieter |
b66069f |
#include <boost/python.hpp>
|
|
Rex Dieter |
b66069f |
+#endif
|
|
Rex Dieter |
b66069f |
|
|
Rex Dieter |
b66069f |
#include <QObject>
|
|
Rex Dieter |
b66069f |
#include <QAction>
|