diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2014-05-24 20:33:19 +0100 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-06-11 19:27:28 +0200 |
| commit | 7eb492219a6170202050a333ad0f770593fd0a48 (patch) | |
| tree | c1b2a2486b23e9cd3d0411681731590f9ee6fffa /external | |
| parent | 17009369673582f579f38e8848e1e1408832c12a (diff) | |
libgltf: turn off openMP usage without any detection code.
Change-Id: Ic823109b812a3d99d8462cf67cd9aa87094bba06
(cherry picked from commit 42f2f473305372050f012aa952ef21b5596fd1cc)
Diffstat (limited to 'external')
| -rw-r--r-- | external/libgltf/UnpackedTarball_libgltf.mk | 1 | ||||
| -rw-r--r-- | external/libgltf/patches/openmp-disable.patch | 12 |
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
|