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

GCC Support for Linux

Browse Source 
Updates and fixes to support GCC for Linux

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
This commit is contained in:
Steve Pham
2022-01-20 13:00:02 -08:00
committed by GitHub
parent 3479b6e2d9
commit 59e43813f0
98 changed files with 1050 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/GridMate/CMakeLists.txt
-1
View File
@@ -18,7 +18,6 @@ ly_add_target(
${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
PLATFORM_INCLUDE_FILES
${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
${common_dir}/gridmate_${PAL_TRAIT_COMPILER_ID_LOWERCASE}.cmake
INCLUDE_DIRECTORIES
PUBLIC
.
Code/Framework/GridMate/GridMate/Carrier/Carrier.cpp
+2 -2
View File
@@ -1702,7 +1702,7 @@ CarrierThread::UpdateReceive()
if (compErr != CompressorError::Ok)
{
AZ_Error("GridMate", compErr == CompressorError::Ok, "Decompress failed with error %d this will lead to data read errors!", compErr);
AZ_Error("GridMate", compErr == CompressorError::Ok, "Decompress failed with error %d this will lead to data read errors!", aznumeric_cast<int32_t>(compErr));
conn->m_isBadPackets = true;
break; /// stop processing this data
}
@@ -2136,7 +2136,7 @@ bool CarrierThread::SendDatagram(ThreadConnection* connection)
{
if (compErr != CompressorError::Ok)
{
AZ_Error("GridMate", compErr == CompressorError::Ok, "Failed to compress chunk with error=%d.\n", static_cast<int>(compErr));
AZ_Error("GridMate", compErr == CompressorError::Ok, "Failed to compress chunk with error=%d.\n", aznumeric_cast<int32_t>(compErr));
}
// we can use writeBuffer directly because we already added the compression hint to indicate that this data is uncompressed
Code/Framework/GridMate/GridMate/Carrier/SecureSocketDriver.cpp
+2
View File
@@ -1455,7 +1455,9 @@ namespace GridMate
ERR_load_SSL_strings();
SSL_load_error_strings();
AZ_PUSH_DISABLE_WARNING(, "-Wdeprecated-declarations", "-Wdeprecated-declarations")
m_sslContext = SSL_CTX_new(DTLSv1_2_method());
AZ_POP_DISABLE_WARNING
if (m_sslContext == nullptr)
{
return EC_SECURE_CREATE;
Code/Framework/GridMate/GridMate/Carrier/StreamSecureSocketDriver.cpp
+5
View File
@@ -47,7 +47,10 @@ namespace GridMate
{
if (s_initializeOpenSSLCount.fetch_sub(1) == 1)
{
AZ_PUSH_DISABLE_WARNING(, "-Wdeprecated-declarations", "-Wdeprecated-declarations")
ERR_remove_state(0);
AZ_POP_DISABLE_WARNING
ERR_free_strings();
EVP_cleanup();
sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
@@ -85,7 +88,9 @@ namespace GridMate
{
return Driver::EC_SECURE_CREATE;
}
AZ_PUSH_DISABLE_WARNING(, "-Wdeprecated-declarations", "-Wdeprecated-declarations")
m_ctx = SSL_CTX_new(TLSv1_2_method());
AZ_POP_DISABLE_WARNING
if (m_ctx == nullptr)
{
return Driver::EC_SECURE_CREATE;
Code/Framework/GridMate/Platform/Common/gridmate_clang.cmake
-15
View File
@@ -1,15 +0,0 @@
#
# Copyright (c) Contributors to the Open 3D Engine Project.
# For complete copyright and license terms please see the LICENSE at the root of this distribution.
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
#
ly_add_source_properties(
SOURCES
GridMate/Carrier/SecureSocketDriver.cpp
GridMate/Carrier/StreamSecureSocketDriver.cpp
PROPERTY COMPILE_OPTIONS
VALUES -Wno-deprecated-declarations
)
Code/Framework/GridMate/Platform/Common/gridmate_msvc.cmake
-8
View File
@@ -1,8 +0,0 @@
#
# Copyright (c) Contributors to the Open 3D Engine Project.
# For complete copyright and license terms please see the LICENSE at the root of this distribution.
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
#