Merge pull request #8937 from void-ppc64/assimp
assimp: restrict a patch that breaks build on ppc
This commit is contained in:
@@ -4,7 +4,7 @@
|
|||||||
/// \author smal.root@gmail.com
|
/// \author smal.root@gmail.com
|
||||||
/// \date 2016
|
/// \date 2016
|
||||||
|
|
||||||
+#if !defined(__x86_64__) && !defined(__i386__)
|
+#if defined(__arm__)
|
||||||
+// Avoid conflict for types GLsizeiptr and GLintptr
|
+// Avoid conflict for types GLsizeiptr and GLintptr
|
||||||
+#define GL_VERSION_1_5
|
+#define GL_VERSION_1_5
|
||||||
+
|
+
|
||||||
|
|||||||
Reference in New Issue
Block a user