diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-18 13:53:19 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-18 13:53:19 +0200 |
| commit | 17f082fe00983c3ef1a5f71611c9278cb16dab20 (patch) | |
| tree | f5af53eb3392975a3c262c6e9624ad90a341a4d1 /external | |
| parent | 9b9f1a5f0642a8ccffb67bd53dc18025f99950c7 (diff) | |
Avoid C++11 solutions from libgltf code
Change-Id: I097798a52157fc688ae520a7f3a0dda84000e20b
Diffstat (limited to 'external')
| -rw-r--r-- | external/libgltf/UnpackedTarball_libgltf.mk | 1 | ||||
| -rw-r--r-- | external/libgltf/patches/avoid_c++11.patch | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk index 44496d190be9..1fbe09d2c992 100644 --- a/external/libgltf/UnpackedTarball_libgltf.mk +++ b/external/libgltf/UnpackedTarball_libgltf.mk @@ -23,6 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\ external/libgltf/patches/unneeded_context_handling.patch \ external/libgltf/patches/include_typo_texture.patch \ external/libgltf/patches/adress_of_temporary.patch \ + external/libgltf/patches/avoid_c++11.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libgltf/patches/avoid_c++11.patch b/external/libgltf/patches/avoid_c++11.patch new file mode 100644 index 000000000000..827e4f584a96 --- /dev/null +++ b/external/libgltf/patches/avoid_c++11.patch @@ -0,0 +1,12 @@ +diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp +--- libgltf.org/src/Shaders.cpp 2014-04-18 13:47:18.006783834 +0200 ++++ libgltf/src/Shaders.cpp 2014-04-18 13:49:20.175779328 +0200 +@@ -219,7 +219,7 @@ +
+ bool ShaderProgram::readShaderFile(const std::string& fileName, std::string& value)
+ {
+- std::ifstream shaderStream(fileName, std::ios::in);
++ std::ifstream shaderStream(fileName.c_str(), std::ios::in);
+ if (!shaderStream.is_open())
+ {
+ return false;
|