summaryrefslogtreecommitdiff
path: root/external/libgltf
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2014-05-24 20:33:19 +0100
committerMichael Meeks <michael.meeks@collabora.com>2014-05-24 20:38:29 +0100
commit42f2f473305372050f012aa952ef21b5596fd1cc (patch)
tree89b6459a06c06c97f4cb2dc939ac3aa6c2127ac8 /external/libgltf
parentd582da903e5cb22bf777aca4ff7d2cdb63673550 (diff)
libgltf: turn off openMP usage without any detection code.
Change-Id: Ic823109b812a3d99d8462cf67cd9aa87094bba06
Diffstat (limited to 'external/libgltf')
-rw-r--r--external/libgltf/UnpackedTarball_libgltf.mk1
-rw-r--r--external/libgltf/patches/openmp-disable.patch12
2 files changed, 13 insertions, 0 deletions
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
index d8434b6e7abe..33889fb49089 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
$(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/include_path_glew.patch \
external/libgltf/patches/include_path_freetype.patch \
+ external/libgltf/patches/openmp-disable.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/openmp-disable.patch b/external/libgltf/patches/openmp-disable.patch
new file mode 100644
index 000000000000..c084183e2f3b
--- /dev/null
+++ b/external/libgltf/patches/openmp-disable.patch
@@ -0,0 +1,12 @@
+--- libgltf/src/RenderScene.h
++++ libgltf/src/RenderScene.h
+@@ -16,7 +16,8 @@
+ #include "FPSCounter.h"
+ #include "Timer.h"
+
+-#define OPENMPENABLE 1
++// Needs a configure / etc. detection to see if omp.h is on the system ...
++#define OPENMPENABLE 0
+ #if OPENMPENABLE
+ #include <omp.h>
+ #define WAVESIZE 4