27431fa55e
Since before ppc, the only relevant non-x86 targets were the ARM ones, and it builds fine on ppc64, restrict this patch to ARM only.
14 lines
377 B
Diff
14 lines
377 B
Diff
--- tools/assimp_qt_viewer/glview.cpp 2017-07-28 22:33:41.000000000 +0200
|
|
+++ tools/assimp_qt_viewer/glview.cpp 2017-08-05 09:47:00.697027943 +0200
|
|
@@ -3,6 +3,11 @@
|
|
/// \author smal.root@gmail.com
|
|
/// \date 2016
|
|
|
|
+#if defined(__arm__)
|
|
+// Avoid conflict for types GLsizeiptr and GLintptr
|
|
+#define GL_VERSION_1_5
|
|
+
|
|
+#endif
|
|
#include "glview.hpp"
|
|
|
|
// Header files, OpenGL.
|