Merge pull request #16437 from sabrina-shanman/instancing_glm_stl

Instancing: Attempt fix for Android build
This commit is contained in:
Sabrina Shanman 2019-11-01 10:42:01 -07:00 committed by GitHub
commit 837cfb9c10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -220,6 +220,7 @@ find_package( Threads )
add_definitions(-DGLM_FORCE_RADIANS)
add_definitions(-DGLM_ENABLE_EXPERIMENTAL)
add_definitions(-DGLM_FORCE_CTOR_INIT)
add_definitions(-DGLM_LANG_STL11_FORCED) # Workaround for GLM not detecting support for C++11 templates on Android
if (WIN32)
# Deal with fakakta Visual Studo 2017 bug