[SPEC-1856] Convert AWSGameLiftServerSDK to new 3rdparty system (#198)
Remove old 3rdparty reference in code, and replace with new target. Lib has been promoted to prod bucket (https://jira.agscollab.com/browse/SPEC-6469)
This commit is contained in:
Vincent Liu
GitHub
-20
@@ -1,20 +0,0 @@
|
||||
#
|
||||
# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
|
||||
# its licensors.
|
||||
#
|
||||
# For complete copyright and license terms please see the LICENSE at the root of this
|
||||
# distribution (the "License"). All use of this software is governed by the License,
|
||||
# or, if provided, by the license below or the license accompanying this file. Do not
|
||||
# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
#
|
||||
ly_add_external_target(
|
||||
NAME AWSGameLiftServerSDK
|
||||
VERSION 3.4.0
|
||||
3RDPARTY_DIRECTORY AWS/GameLift
|
||||
INCLUDE_DIRECTORIES include
|
||||
COMPILE_DEFINITIONS
|
||||
AWS_CUSTOM_MEMORY_MANAGEMENT
|
||||
PLATFORM_SUPPORTS_AWS_NATIVE_SDK
|
||||
GAMELIFT_USE_STD
|
||||
)
|
||||
@@ -1,21 +0,0 @@
|
||||
#
|
||||
# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
|
||||
# its licensors.
|
||||
#
|
||||
# For complete copyright and license terms please see the LICENSE at the root of this
|
||||
# distribution (the "License"). All use of this software is governed by the License,
|
||||
# or, if provided, by the license below or the license accompanying this file. Do not
|
||||
# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
#
|
||||
|
||||
# TODO AWSGameLiftServerSDK Linux shared libs are not compiled.
|
||||
set(AWSGAMELIFTSERVERSDK_LIB_PATH ${BASE_PATH}/lib/linux/libstdcxx/intel64/clang-6.0.0/$<IF:$<CONFIG:Debug>,Debug,Release>)
|
||||
|
||||
set(AWSGAMELIFTSERVERSDK_LIBS ${AWSGAMELIFTSERVERSDK_LIB_PATH}/libaws-cpp-sdk-gamelift-server.a
|
||||
${AWSGAMELIFTSERVERSDK_LIB_PATH}/libsioclient.a
|
||||
${AWSGAMELIFTSERVERSDK_LIB_PATH}/libboost_date_time.a
|
||||
${AWSGAMELIFTSERVERSDK_LIB_PATH}/libboost_random.a
|
||||
${AWSGAMELIFTSERVERSDK_LIB_PATH}/libboost_system.a
|
||||
${AWSGAMELIFTSERVERSDK_LIB_PATH}/libprotobuf.a
|
||||
)
|
||||
@@ -33,6 +33,7 @@ ly_associate_package(PACKAGE_NAME xxhash-0.7.4-rev1-multiplatform TARG
|
||||
ly_associate_package(PACKAGE_NAME PVRTexTool-4.24.0-rev4-multiplatform TARGETS PVRTexTool PACKAGE_HASH d0d6da61c7557de0d2c71fc35ba56c3be49555b703f0e853d4c58225537acf1e)
|
||||
|
||||
# platform-specific:
|
||||
ly_associate_package(PACKAGE_NAME AWSGameLiftServerSDK-3.4.1-rev1-linux TARGETS AWSGameLiftServerSDK PACKAGE_HASH a8149a95bd100384af6ade97e2b21a56173740d921e6c3da8188cd51554d39af)
|
||||
ly_associate_package(PACKAGE_NAME freetype-2.10.4.14-linux TARGETS freetype PACKAGE_HASH 9ad246873067717962c6b780d28a5ce3cef3321b73c9aea746a039c798f52e93)
|
||||
ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-linux TARGETS tiff PACKAGE_HASH ae92b4d3b189c42ef644abc5cac865d1fb2eb7cb5622ec17e35642b00d1a0a76)
|
||||
ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev3-linux TARGETS AWSNativeSDK PACKAGE_HASH e69c55682638dc1e7fa571a61a82c8a69d395c74a008543a5188f4bd2b6b10c4)
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
#
|
||||
|
||||
set(FILES
|
||||
AWSGameLiftServerSDK_linux.cmake
|
||||
BuiltInPackages_linux.cmake
|
||||
dyad_linux.cmake
|
||||
FbxSdk_linux.cmake
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
#
|
||||
# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
|
||||
# its licensors.
|
||||
#
|
||||
# For complete copyright and license terms please see the LICENSE at the root of this
|
||||
# distribution (the "License"). All use of this software is governed by the License,
|
||||
# or, if provided, by the license below or the license accompanying this file. Do not
|
||||
# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
#
|
||||
|
||||
if (LY_MONOLITHIC_GAME)
|
||||
# Import Libs
|
||||
set(AWSGAMELIFTSERVERSDK_LIB_PATH ${BASE_PATH}/lib/windows/intel64/vs2017/$<IF:$<CONFIG:Debug>,Debug,Release>)
|
||||
else()
|
||||
# Static Libs
|
||||
set(AWSGAMELIFTSERVERSDK_LIB_PATH ${BASE_PATH}/bin/windows/intel64/vs2017/$<IF:$<CONFIG:Debug>,Debug,Release>)
|
||||
endif()
|
||||
|
||||
set(AWSGAMELIFTSERVERSDK_LIBS
|
||||
${AWSGAMELIFTSERVERSDK_LIB_PATH}/sioclient.lib
|
||||
${AWSGAMELIFTSERVERSDK_LIB_PATH}/libboost_date_time.lib
|
||||
${AWSGAMELIFTSERVERSDK_LIB_PATH}/libboost_random.lib
|
||||
${AWSGAMELIFTSERVERSDK_LIB_PATH}/libboost_system.lib
|
||||
${AWSGAMELIFTSERVERSDK_LIB_PATH}/libprotobuf$<$<CONFIG:Debug>:d>.lib
|
||||
)
|
||||
|
||||
set(AWSGAMELIFTSERVERSDK_COMPILE_DEFINITIONS
|
||||
USE_IMPORT_EXPORT
|
||||
AWS_CUSTOM_MEMORY_MANAGEMENT
|
||||
PLATFORM_SUPPORTS_AWS_NATIVE_SDK
|
||||
GAMELIFT_USE_STD
|
||||
)
|
||||
|
||||
if (NOT LY_MONOLITHIC_GAME)
|
||||
|
||||
# Add 'USE_IMPORT_EXPORT' for external linkage
|
||||
LIST(APPEND AWSGAMELIFTSERVERSDK_COMPILE_DEFINITIONS USE_IMPORT_EXPORT)
|
||||
|
||||
# Import Lib
|
||||
LIST(APPEND AWSGAMELIFTSERVERSDK_LIBS ${AWSGAMELIFTSERVERSDK_LIB_PATH}/aws-cpp-sdk-gamelift-server.lib)
|
||||
|
||||
# Shared libs
|
||||
set(AWSGAMELIFTSERVERSDK_SHARED_LIB_PATH ${BASE_PATH}/bin/windows/intel64/vs2017/$<IF:$<CONFIG:Debug>,Debug,Release>)
|
||||
set(AWSGAMELIFTSERVERSDK_RUNTIME_DEPENDENCIES ${AWSGAMELIFTSERVERSDK_SHARED_LIB_PATH}/aws-cpp-sdk-gamelift-server.dll)
|
||||
|
||||
endif()
|
||||
@@ -39,6 +39,7 @@ ly_associate_package(PACKAGE_NAME Blast-1.1.7-rev1-multiplatform
|
||||
ly_associate_package(PACKAGE_NAME PVRTexTool-4.24.0-rev4-multiplatform TARGETS PVRTexTool PACKAGE_HASH d0d6da61c7557de0d2c71fc35ba56c3be49555b703f0e853d4c58225537acf1e)
|
||||
|
||||
# platform-specific:
|
||||
ly_associate_package(PACKAGE_NAME AWSGameLiftServerSDK-3.4.1-rev1-windows TARGETS AWSGameLiftServerSDK PACKAGE_HASH a0586b006e4def65cc25f388de17dc475e417dc1e6f9d96749777c88aa8271b0)
|
||||
ly_associate_package(PACKAGE_NAME freetype-2.10.4.14-windows TARGETS freetype PACKAGE_HASH 88dedc86ccb8c92f14c2c033e51ee7d828fa08eafd6475c6aa963938a99f4bf3)
|
||||
ly_associate_package(PACKAGE_NAME tiff-4.2.0.14-windows TARGETS tiff PACKAGE_HASH ab60d1398e4e1e375ec0f1a00cdb1d812a07c0096d827db575ce52dd6d714207)
|
||||
ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev3-windows TARGETS AWSNativeSDK PACKAGE_HASH 929873d4252c464620a9d288e41bd5d47c0bd22750aeb3a1caa68a3da8247c48)
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
#
|
||||
|
||||
set(FILES
|
||||
AWSGameLiftServerSDK_windows.cmake
|
||||
BuiltInPackages_windows.cmake
|
||||
Crashpad_windows.cmake
|
||||
DirectXShaderCompiler_windows.cmake
|
||||
|
||||
Vendored
-1
@@ -11,7 +11,6 @@
|
||||
|
||||
set(FILES
|
||||
BuiltInPackages.cmake
|
||||
FindAWSGameLiftServerSDK.cmake
|
||||
FindClang.cmake
|
||||
FindDirectXShaderCompiler.cmake
|
||||
Finddyad.cmake
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
"@3rdParty": {
|
||||
"3rdParty.txt": "#include",
|
||||
"AWS/AWSNativeSDK/1.7.167-az.2/**": "#include",
|
||||
"AWS/GameLift/3.4.0/**": "#include",
|
||||
"CMake/3.19.1/**": "#include",
|
||||
"DirectXShaderCompiler/1.0.1-az.1/**": "#include",
|
||||
"DirectXShaderCompiler/2020.08.07/**": "#include",
|
||||
|
||||
@@ -17,12 +17,6 @@
|
||||
"bin/linux/**":"#include",
|
||||
"lib/linux/**":"#include"
|
||||
},
|
||||
"AWS/GameLift/3.4.0":{
|
||||
"*":"#include",
|
||||
"include/**":"#include",
|
||||
"bin/windows/**":"#include",
|
||||
"lib/linux/libstdcxx/**":"#include"
|
||||
},
|
||||
"DirectXShaderCompiler/1.0.1-az.1":{
|
||||
"*":"#include",
|
||||
"src/**":"#include",
|
||||
|
||||
Reference in New Issue
Block a user