Integrating up through commit 90f050496

2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
@@ -17,7 +17,10 @@
 #include "../offline/hash.h"

 #if defined(_WIN32) && !defined(PORTABLE)
+#include <AzCore/PlatformDef.h>
+AZ_PUSH_DISABLE_WARNING(4115, "-Wunknown-warning-option")
 #include <d3dcompiler.h>
+AZ_POP_DISABLE_WARNING
 #pragma comment(lib,"d3dcompiler.lib")
 #endif //defined(_WIN32) && !defined(PORTABLE)