diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-30 17:58:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 17:58:17 +0200 |
| commit | 092a1cfb398063c698fcdf302ecc93f1a7d794b7 (patch) | |
| tree | 9fab6917b8555e6ac22d57ed38df6c0362edc018 /modules/tinyexr | |
| parent | 41ac6cfac155bc977bc619b74ac411b8887d9635 (diff) | |
| parent | 2175397210b5e433e3cb63d1aad4a9d6e53aabec (diff) | |
Merge pull request #38365 from akien-mga/tinyexr-4dbd05a
tinyexr: Sync with upstream 4dbd05a + enable C++11 threaded loading
Diffstat (limited to 'modules/tinyexr')
| -rw-r--r-- | modules/tinyexr/SCsub | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/tinyexr/SCsub b/modules/tinyexr/SCsub index e7fd44fabd..84b3b4015b 100644 --- a/modules/tinyexr/SCsub +++ b/modules/tinyexr/SCsub @@ -15,6 +15,9 @@ thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env_tinyexr.Prepend(CPPPATH=[thirdparty_dir]) +# Enable threaded loading with C++11. +env_tinyexr.Append(CPPDEFINES=["TINYEXR_USE_THREAD"]) + env_thirdparty = env_tinyexr.Clone() env_thirdparty.disable_warnings() env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources) |