birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for VS < 17 and Android

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-14 14:10:17 -07:00
parent 988a6b7443
commit e356003fb5
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Source/Animation/AnimSplineTrack.h
+4 -4
View File
@@ -326,16 +326,16 @@ public:
m_defaultValue = value;
}
ColorB GetCustomColor() const override
ColorB GetCustomColor() const
{ return m_customColor; }
void SetCustomColor(ColorB color) override
void SetCustomColor(ColorB color)
{
m_customColor = color;
m_bCustomColorSet = true;
}
bool HasCustomColor() const override
bool HasCustomColor() const
{ return m_bCustomColorSet; }
void ClearCustomColor() override
void ClearCustomColor()
{ m_bCustomColorSet = false; }
static void Reflect(AZ::SerializeContext* serializeContext) {}
Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack.h
+4 -4
View File
@@ -329,16 +329,16 @@ public:
m_defaultValue = value;
}
ColorB GetCustomColor() const override
ColorB GetCustomColor() const
{ return m_customColor; }
void SetCustomColor(ColorB color) override
void SetCustomColor(ColorB color)
{
m_customColor = color;
m_bCustomColorSet = true;
}
bool HasCustomColor() const override
bool HasCustomColor() const
{ return m_bCustomColorSet; }
void ClearCustomColor() override
void ClearCustomColor()
{ m_bCustomColorSet = false; }
void SetMultiplier(float trackMultiplier) override
cmake/Platform/Common/MSVC/Configurations_msvc.cmake
-1
View File
@@ -141,7 +141,6 @@ endif()
ly_set(LY_CXX_SYSTEM_INCLUDE_CONFIGURATION_FLAG
/experimental:external # Turns on "external" headers feature for MSVC compilers
/external:W0 # Set warning level in external headers to 0. This is used to suppress warnings 3rdParty libraries which uses the "system_includes" option in their json configuration
/analyze:external- # disable analysis on external headers
)
if(NOT CMAKE_INCLUDE_SYSTEM_FLAG_CXX)
ly_set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX /external:I)