Commit beb374d2 authored by Jussi Lindgren's avatar Jussi Lindgren

Plugins: Prevented compilation of Python box under Python 3

parent 006b2322
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "ovpCBoxAlgorithmPython.h" #include "ovpCBoxAlgorithmPython.h"
#if defined(PY_MAJOR_VERSION) && (PY_MAJOR_VERSION == 2)
#include <iostream> #include <iostream>
...@@ -2069,5 +2070,6 @@ OpenViBE::boolean CBoxAlgorithmPython::process(void) ...@@ -2069,5 +2070,6 @@ OpenViBE::boolean CBoxAlgorithmPython::process(void)
return true; return true;
} }
#endif // #if defined(PY_MAJOR_VERSION) && (PY_MAJOR_VERSION == 2)
#endif // TARGET_HAS_ThirdPartyPython #endif // TARGET_HAS_ThirdPartyPython
#endif #endif
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
#include <Python.h> #include <Python.h>
#if defined(PY_MAJOR_VERSION) && (PY_MAJOR_VERSION == 2)
#include "../ovp_defines.h" #include "../ovp_defines.h"
#include <openvibe/ov_all.h> #include <openvibe/ov_all.h>
#include <toolkit/ovtk_all.h> #include <toolkit/ovtk_all.h>
...@@ -145,6 +147,8 @@ namespace OpenViBEPlugins ...@@ -145,6 +147,8 @@ namespace OpenViBEPlugins
}; };
}; };
#endif // #if defined(PY_MAJOR_VERSION) && (PY_MAJOR_VERSION == 2)
#endif // TARGET_HAS_ThirdPartyPython #endif // TARGET_HAS_ThirdPartyPython
#endif // __OpenViBEPlugins_BoxAlgorithm_Python_H__ #endif // __OpenViBEPlugins_BoxAlgorithm_Python_H__
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#include "box-algorithms/ovpCBoxAlgorithmPython.h" #include "box-algorithms/ovpCBoxAlgorithmPython.h"
#if defined(PY_MAJOR_VERSION) && (PY_MAJOR_VERSION == 2)
#ifdef TARGET_OS_Windows #ifdef TARGET_OS_Windows
#include "windows.h" #include "windows.h"
#endif #endif
...@@ -119,6 +121,10 @@ OVP_Declare_Begin(); ...@@ -119,6 +121,10 @@ OVP_Declare_Begin();
OVP_Declare_End(); OVP_Declare_End();
#else
#pragma message ("WARNING: Python 2.x headers are required to build the Python plugin, different includes found, skipped")
#endif // #if defined(PY_MAJOR_VERSION) && (PY_MAJOR_VERSION == 2)
#endif // TARGET_HAS_ThirdPartyPython #endif // TARGET_HAS_ThirdPartyPython
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment