Update source to v6.11.18282.01000

This commit is contained in:
Will Pearson
2018-10-10 22:43:34 +01:00
parent 08ba072313
commit 80b0545f2b
93 changed files with 8784 additions and 2972 deletions

View File

@@ -47,8 +47,10 @@
#define ON_RUNTIME_WIN
#endif
#elif defined(__ANDROID__)
#elif defined(__ANDROID__) || defined(__EMSCRIPTEN__)
// __EMSCRIPTEN__ is for a web assembly compile which currently compiles with the
// same settings as an android build. We will need to add an ON_RUNTIME_WASM once
// the __EMSCRIPTEN__ compile stabilizes
#if !defined(ON_RUNTIME_ANDROID)
#define ON_RUNTIME_ANDROID
#endif