Integrating github/staging through commit b0dd7ed

Code/CryEngine/CryCommon/BaseTypes.h

@@ -71,10 +71,14 @@ COMPILE_TIME_ASSERT(sizeof(uint32) == 4);
 COMPILE_TIME_ASSERT(sizeof(sint32) == 4);
 
 typedef slonglong int64;
+
+#ifndef O3DE_INT64_DEFINED
+#define O3DE_INT64_DEFINED
 typedef slonglong sint64;
 typedef ulonglong uint64;
 COMPILE_TIME_ASSERT(sizeof(uint64) == 8);
 COMPILE_TIME_ASSERT(sizeof(sint64) == 8);
+#endif
 
 
 typedef float  f32;

Code/CryEngine/CryFont/CMakeLists.txt

@@ -19,6 +19,6 @@ ly_add_target(
             .
     BUILD_DEPENDENCIES
         PRIVATE
-            3rdParty::FreeType2
+            3rdParty::freetype
             Legacy::CryCommon
 )

Code/CryEngine/CrySystem/ImageHandler.cpp

@@ -22,7 +22,7 @@
 #endif
 
 #if !(defined(ANDROID) || defined(IOS) || defined(LINUX)) && AZ_LEGACY_CRYSYSTEM_TRAIT_IMAGEHANDLER_TIFFIO // Rally US1050 - Compile libtiff for Android and IOS
-    #include <libtiff/tiffio.h>
+    #include <tiffio.h>
 
 static_assert(sizeof(thandle_t) >= sizeof(AZ::IO::HandleType), "Platform defines thandle_t to be smaller than required");
 #endif