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

Merged main in

Browse Source
This commit is contained in:
Aristo7
2021-04-21 15:34:29 -04:00
parent c07c57ca2a 626f7c00fe
commit 9e874ae2ed
490 changed files with 28443 additions and 7835 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/3rdParty/Platform/Android/civetweb_android.cmake
Vendored
-10
View File
@@ -1,10 +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.
#
cmake/3rdParty/Platform/Android/cmake_android_files.cmake
Vendored
-1
View File
@@ -11,7 +11,6 @@
set(FILES
BuiltInPackages_android.cmake
civetweb_android.cmake
VkValidation_android.cmake
Wwise_android.cmake
)
cmake/3rdParty/Platform/Linux/AWSGameLiftServerSDK_linux.cmake
Vendored
-21
View File
@@ -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
)
cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake
Vendored
+2 -3
View File
@@ -15,7 +15,7 @@ ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev3-multiplatform TARG
ly_associate_package(PACKAGE_NAME ilmbase-2.3.0-rev4-multiplatform TARGETS ilmbase PACKAGE_HASH 97547fdf1fbc4d81b8ccf382261f8c25514ed3b3c4f8fd493f0a4fa873bba348)
ly_associate_package(PACKAGE_NAME hdf5-1.0.11-rev2-multiplatform TARGETS hdf5 PACKAGE_HASH 11d5e04df8a93f8c52a5684a4cacbf0d9003056360983ce34f8d7b601082c6bd)
ly_associate_package(PACKAGE_NAME alembic-1.7.11-rev3-multiplatform TARGETS alembic PACKAGE_HASH ba7a7d4943dd752f5a662374f6c48b93493df1d8e2c5f6a8d101f3b50700dd25)
ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev6-multiplatform TARGETS assimplib PACKAGE_HASH 47f1a6d05d101def036c030484c4a6e19d745aacd57037174715c7afe2b19b4c)
ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev7-multiplatform TARGETS assimplib PACKAGE_HASH def855c89d8210db3040f1cb6ec837141ab9b8e74c158eae7c03d50160fcf30b)
ly_associate_package(PACKAGE_NAME squish-ccr-20150601-rev3-multiplatform TARGETS squish-ccr PACKAGE_HASH c878c6c0c705e78403c397d03f5aa7bc87e5978298710e14d09c9daf951a83b3)
ly_associate_package(PACKAGE_NAME ASTCEncoder-2017_11_14-rev2-multiplatform TARGETS ASTCEncoder PACKAGE_HASH c240ffc12083ee39a5ce9dc241de44d116e513e1e3e4cc1d05305e7aa3bdc326)
ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform TARGETS md5 PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
@@ -31,10 +31,9 @@ ly_associate_package(PACKAGE_NAME glad-2.0.0-beta-rev2-multiplatform TARG
ly_associate_package(PACKAGE_NAME lux_core-2.2-rev5-multiplatform TARGETS lux_core PACKAGE_HASH c8c13cf7bc351643e1abd294d0841b24dee60e51647dff13db7aec396ad1e0b5)
ly_associate_package(PACKAGE_NAME xxhash-0.7.4-rev1-multiplatform TARGETS xxhash PACKAGE_HASH e81f3e6c4065975833996dd1fcffe46c3cf0f9e3a4207ec5f4a1b564ba75861e)
ly_associate_package(PACKAGE_NAME PVRTexTool-4.24.0-rev4-multiplatform TARGETS PVRTexTool PACKAGE_HASH d0d6da61c7557de0d2c71fc35ba56c3be49555b703f0e853d4c58225537acf1e)
ly_associate_package(PACKAGE_NAME poly2tri-0.3.3-rev2-multiplatform TARGETS poly2tri PACKAGE_HASH 04092d06716f59b936b61906eaf3647db23b685d81d8b66131eb53e0aeaa1a38)
ly_associate_package(PACKAGE_NAME v-hacd-2.0-rev1-multiplatform TARGETS v-hacd PACKAGE_HASH 5c71aef19cc9787d018d64eec076e9f51ea5a3e0dc6b6e22e57c898f6cc4afe3)
# 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)
cmake/3rdParty/Platform/Linux/Clang_linux.cmake
Vendored
-43
View File
@@ -1,43 +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.
#
set(CLANG_PLATFORM_LIB_PATH ${BASE_PATH}/linux_x64/release/lib)
set(CLANG_INCLUDE_DIRECTORIES
llvm/include
linux_x64/release/include
)
set(CLANG_LIBS
${CLANG_PLATFORM_LIB_PATH}/libclangFrontend.a
${CLANG_PLATFORM_LIB_PATH}/libclangSerialization.a
${CLANG_PLATFORM_LIB_PATH}/libclangDriver.a
${CLANG_PLATFORM_LIB_PATH}/libclangTooling.a
${CLANG_PLATFORM_LIB_PATH}/libclangParse.a
${CLANG_PLATFORM_LIB_PATH}/libclangSema.a
${CLANG_PLATFORM_LIB_PATH}/libclangAnalysis.a
${CLANG_PLATFORM_LIB_PATH}/libclangRewriteFrontend.a
${CLANG_PLATFORM_LIB_PATH}/libclangRewrite.a
${CLANG_PLATFORM_LIB_PATH}/libclangEdit.a
${CLANG_PLATFORM_LIB_PATH}/libclangAST.a
${CLANG_PLATFORM_LIB_PATH}/libclangLex.a
${CLANG_PLATFORM_LIB_PATH}/libclangBasic.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMCore.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMBinaryFormat.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMDebugInfoDWARF.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMMC.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMOption.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMBitReader.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMMCParser.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMProfileData.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMTarget.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMSupport.a
)
cmake/3rdParty/Platform/Linux/civetweb_linux.cmake
Vendored
-10
View File
@@ -1,10 +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.
#
cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake
Vendored
-3
View File
@@ -10,10 +10,7 @@
#
set(FILES
AWSGameLiftServerSDK_linux.cmake
BuiltInPackages_linux.cmake
civetweb_linux.cmake
Clang_linux.cmake
dyad_linux.cmake
FbxSdk_linux.cmake
OpenSSL_linux.cmake
cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
Vendored
+1 -3
View File
@@ -15,7 +15,7 @@ ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev3-multiplatform
ly_associate_package(PACKAGE_NAME ilmbase-2.3.0-rev4-multiplatform TARGETS ilmbase PACKAGE_HASH 97547fdf1fbc4d81b8ccf382261f8c25514ed3b3c4f8fd493f0a4fa873bba348)
ly_associate_package(PACKAGE_NAME hdf5-1.0.11-rev2-multiplatform TARGETS hdf5 PACKAGE_HASH 11d5e04df8a93f8c52a5684a4cacbf0d9003056360983ce34f8d7b601082c6bd)
ly_associate_package(PACKAGE_NAME alembic-1.7.11-rev3-multiplatform TARGETS alembic PACKAGE_HASH ba7a7d4943dd752f5a662374f6c48b93493df1d8e2c5f6a8d101f3b50700dd25)
ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev6-multiplatform TARGETS assimplib PACKAGE_HASH 47f1a6d05d101def036c030484c4a6e19d745aacd57037174715c7afe2b19b4c)
ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev7-multiplatform TARGETS assimplib PACKAGE_HASH def855c89d8210db3040f1cb6ec837141ab9b8e74c158eae7c03d50160fcf30b)
ly_associate_package(PACKAGE_NAME squish-ccr-20150601-rev3-multiplatform TARGETS squish-ccr PACKAGE_HASH c878c6c0c705e78403c397d03f5aa7bc87e5978298710e14d09c9daf951a83b3)
ly_associate_package(PACKAGE_NAME ASTCEncoder-2017_11_14-rev2-multiplatform TARGETS ASTCEncoder PACKAGE_HASH c240ffc12083ee39a5ce9dc241de44d116e513e1e3e4cc1d05305e7aa3bdc326)
ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform TARGETS md5 PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
@@ -36,8 +36,6 @@ ly_associate_package(PACKAGE_NAME glad-2.0.0-beta-rev2-multiplatform
ly_associate_package(PACKAGE_NAME lux_core-2.2-rev5-multiplatform TARGETS lux_core PACKAGE_HASH c8c13cf7bc351643e1abd294d0841b24dee60e51647dff13db7aec396ad1e0b5)
ly_associate_package(PACKAGE_NAME xxhash-0.7.4-rev1-multiplatform TARGETS xxhash PACKAGE_HASH e81f3e6c4065975833996dd1fcffe46c3cf0f9e3a4207ec5f4a1b564ba75861e)
ly_associate_package(PACKAGE_NAME PVRTexTool-4.24.0-rev4-multiplatform TARGETS PVRTexTool PACKAGE_HASH d0d6da61c7557de0d2c71fc35ba56c3be49555b703f0e853d4c58225537acf1e)
ly_associate_package(PACKAGE_NAME poly2tri-0.3.3-rev2-multiplatform TARGETS poly2tri PACKAGE_HASH 04092d06716f59b936b61906eaf3647db23b685d81d8b66131eb53e0aeaa1a38)
ly_associate_package(PACKAGE_NAME v-hacd-2.0-rev1-multiplatform TARGETS v-hacd PACKAGE_HASH 5c71aef19cc9787d018d64eec076e9f51ea5a3e0dc6b6e22e57c898f6cc4afe3)
# platform-specific:
ly_associate_package(PACKAGE_NAME freetype-2.10.4.14-mac-ios TARGETS freetype PACKAGE_HASH 67b4f57aed92082d3fd7c16aa244a7d908d90122c296b0a63f73e0a0b8761977)
cmake/3rdParty/Platform/Mac/Clang_mac.cmake
Vendored
-49
View File
@@ -1,49 +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.
#
set(CLANG_PLATFORM_LIB_PATH ${BASE_PATH}/xcode/$<IF:$<CONFIG:Debug>,debug,release>/lib)
set(CLANG_INCLUDE_DIRECTORIES
llvm/include
xcode/$<IF:$<CONFIG:Debug>,debug,release>/include
)
set(CLANG_LIBS
${CLANG_PLATFORM_LIB_PATH}/libclangFrontend.a
${CLANG_PLATFORM_LIB_PATH}/libclangSerialization.a
${CLANG_PLATFORM_LIB_PATH}/libclangDriver.a
${CLANG_PLATFORM_LIB_PATH}/libclangTooling.a
${CLANG_PLATFORM_LIB_PATH}/libclangParse.a
${CLANG_PLATFORM_LIB_PATH}/libclangSema.a
${CLANG_PLATFORM_LIB_PATH}/libclangAnalysis.a
${CLANG_PLATFORM_LIB_PATH}/libclangRewriteFrontend.a
${CLANG_PLATFORM_LIB_PATH}/libclangRewrite.a
${CLANG_PLATFORM_LIB_PATH}/libclangEdit.a
${CLANG_PLATFORM_LIB_PATH}/libclangAST.a
${CLANG_PLATFORM_LIB_PATH}/libclangASTMatchers.a
${CLANG_PLATFORM_LIB_PATH}/libclangLex.a
${CLANG_PLATFORM_LIB_PATH}/libclangBasic.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMCore.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMBinaryFormat.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMDebugInfoDWARF.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMMC.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMOption.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMBitReader.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMMCParser.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMProfileData.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMTarget.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMSupport.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMDemangle.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMSupport.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMCore.a
)
cmake/3rdParty/Platform/Windows/civetweb_windows.cmake → cmake/3rdParty/Platform/Mac/OpenGLInterface_mac.cmake
Vendored
+2 -2
View File
@@ -9,5 +9,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
#
set(CIVETWEB_LIBS ${BASE_PATH}/lib/Windows/$<IF:$<CONFIG:Debug>,debug,release>/civetweb.lib)
# MacOS 10.14 deprecates OpenGL. This silences the warnings for now.
set(OPENGLINTERFACE_COMPILE_DEFINITIONS GL_SILENCE_DEPRECATION)
cmake/3rdParty/Platform/Mac/civetweb_mac.cmake
Vendored
-10
View File
@@ -1,10 +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.
#
cmake/3rdParty/Platform/Mac/cmake_mac_files.cmake
Vendored
+1 -2
View File
@@ -11,9 +11,8 @@
set(FILES
BuiltInPackages_mac.cmake
civetweb_mac.cmake
Clang_mac.cmake
FbxSdk_mac.cmake
OpenGLInterface_mac.cmake
OpenSSL_mac.cmake
Wwise_mac.cmake
)
cmake/3rdParty/Platform/Windows/AWSGameLiftServerSDK_windows.cmake
Vendored
-47
View File
@@ -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()
cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
Vendored
+5 -6
View File
@@ -15,7 +15,7 @@ ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev3-multiplatform
ly_associate_package(PACKAGE_NAME ilmbase-2.3.0-rev4-multiplatform TARGETS ilmbase PACKAGE_HASH 97547fdf1fbc4d81b8ccf382261f8c25514ed3b3c4f8fd493f0a4fa873bba348)
ly_associate_package(PACKAGE_NAME hdf5-1.0.11-rev2-multiplatform TARGETS hdf5 PACKAGE_HASH 11d5e04df8a93f8c52a5684a4cacbf0d9003056360983ce34f8d7b601082c6bd)
ly_associate_package(PACKAGE_NAME alembic-1.7.11-rev3-multiplatform TARGETS alembic PACKAGE_HASH ba7a7d4943dd752f5a662374f6c48b93493df1d8e2c5f6a8d101f3b50700dd25)
ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev6-multiplatform TARGETS assimplib PACKAGE_HASH 47f1a6d05d101def036c030484c4a6e19d745aacd57037174715c7afe2b19b4c)
ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev7-multiplatform TARGETS assimplib PACKAGE_HASH def855c89d8210db3040f1cb6ec837141ab9b8e74c158eae7c03d50160fcf30b)
ly_associate_package(PACKAGE_NAME squish-ccr-20150601-rev3-multiplatform TARGETS squish-ccr PACKAGE_HASH c878c6c0c705e78403c397d03f5aa7bc87e5978298710e14d09c9daf951a83b3)
ly_associate_package(PACKAGE_NAME ASTCEncoder-2017_11_14-rev2-multiplatform TARGETS ASTCEncoder PACKAGE_HASH c240ffc12083ee39a5ce9dc241de44d116e513e1e3e4cc1d05305e7aa3bdc326)
ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform TARGETS md5 PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
@@ -37,11 +37,9 @@ ly_associate_package(PACKAGE_NAME lux_core-2.2-rev5-multiplatform
ly_associate_package(PACKAGE_NAME xxhash-0.7.4-rev1-multiplatform TARGETS xxhash PACKAGE_HASH e81f3e6c4065975833996dd1fcffe46c3cf0f9e3a4207ec5f4a1b564ba75861e)
ly_associate_package(PACKAGE_NAME Blast-1.1.7-rev1-multiplatform TARGETS Blast PACKAGE_HASH 36b8f393bcd25d0f85cfc7a831ebbdac881e6054c4f0735649966aa6aa86e6f0)
ly_associate_package(PACKAGE_NAME PVRTexTool-4.24.0-rev4-multiplatform TARGETS PVRTexTool PACKAGE_HASH d0d6da61c7557de0d2c71fc35ba56c3be49555b703f0e853d4c58225537acf1e)
ly_associate_package(PACKAGE_NAME NvCloth-1.1.6-rev1-multiplatform TARGETS NvCloth PACKAGE_HASH 05fc62634ca28644e7659a89e97f4520d791e6ddf4b66f010ac669e4e2ed4454)
ly_associate_package(PACKAGE_NAME poly2tri-0.3.3-rev2-multiplatform TARGETS poly2tri PACKAGE_HASH 04092d06716f59b936b61906eaf3647db23b685d81d8b66131eb53e0aeaa1a38)
ly_associate_package(PACKAGE_NAME v-hacd-2.0-rev1-multiplatform TARGETS v-hacd PACKAGE_HASH 5c71aef19cc9787d018d64eec076e9f51ea5a3e0dc6b6e22e57c898f6cc4afe3)
# 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)
@@ -52,7 +50,8 @@ ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-windows TARGETS goo
ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-windows TARGETS GoogleBenchmark PACKAGE_HASH 0c94ca69ae8e7e4aab8e90032b5c82c5964410429f3dd9dbb1f9bf4fe032b1d4)
ly_associate_package(PACKAGE_NAME d3dx12-headers-rev1-windows TARGETS d3dx12 PACKAGE_HASH 088c637159fba4a3e4c0cf08fb4921906fd4cca498939bd239db7c54b5b2f804)
ly_associate_package(PACKAGE_NAME pyside2-qt-5.15.1-rev2-windows TARGETS pyside2 PACKAGE_HASH c90f3efcc7c10e79b22a33467855ad861f9dbd2e909df27a5cba9db9fa3edd0f)
ly_associate_package(PACKAGE_NAME openimageio-2.1.16.0-rev1-windows TARGETS OpenImageIO PACKAGE_HASH b9f6d6df180ad240b9f17a68c1862c7d8f38234de0e692e83116254b0ee467e5)
ly_associate_package(PACKAGE_NAME openimageio-2.1.16.0-rev2-windows TARGETS OpenImageIO PACKAGE_HASH 85a2a6cf35cbc4c967c56ca8074babf0955c5b490c90c6e6fd23c78db99fc282)
ly_associate_package(PACKAGE_NAME qt-5.15.2-windows TARGETS Qt PACKAGE_HASH edaf954c647c99727bfd313dab2959803d2df0873914bb96368c3d8286eed6d9)
ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-windows TARGETS libsamplerate PACKAGE_HASH dcf3c11a96f212a52e2c9241abde5c364ee90b0f32fe6eeb6dcdca01d491829f)
ly_associate_package(PACKAGE_NAME OpenMesh-8.1-rev1-windows TARGETS OpenMesh PACKAGE_HASH 1c1df639358526c368e790dfce40c45cbdfcfb1c9a041b9d7054a8949d88ee77)
ly_associate_package(PACKAGE_NAME OpenMesh-8.1-rev1-windows TARGETS OpenMesh PACKAGE_HASH 1c1df639358526c368e790dfce40c45cbdfcfb1c9a041b9d7054a8949d88ee77)
ly_associate_package(PACKAGE_NAME civetweb-1.8-rev1-windows TARGETS civetweb PACKAGE_HASH 36d0e58a59bcdb4dd70493fb1b177aa0354c945b06c30416348fd326cf323dd4)
cmake/3rdParty/Platform/Windows/Clang_windows.cmake
Vendored
-44
View File
@@ -1,44 +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.
#
set(CLANG_PLATFORM_LIB_PATH ${BASE_PATH}/vs2015/$<IF:$<CONFIG:Debug>,debug,release>/lib)
set(CLANG_INCLUDE_DIRECTORIES
llvm/include
vs2015/$<IF:$<CONFIG:Debug>,debug,release>/include
)
set(CLANG_LIBS
${CLANG_PLATFORM_LIB_PATH}/clangFrontend.lib
${CLANG_PLATFORM_LIB_PATH}/clangSerialization.lib
${CLANG_PLATFORM_LIB_PATH}/clangDriver.lib
${CLANG_PLATFORM_LIB_PATH}/clangTooling.lib
${CLANG_PLATFORM_LIB_PATH}/clangParse.lib
${CLANG_PLATFORM_LIB_PATH}/clangSema.lib
${CLANG_PLATFORM_LIB_PATH}/clangAnalysis.lib
${CLANG_PLATFORM_LIB_PATH}/clangRewriteFrontend.lib
${CLANG_PLATFORM_LIB_PATH}/clangRewrite.lib
${CLANG_PLATFORM_LIB_PATH}/clangEdit.lib
${CLANG_PLATFORM_LIB_PATH}/clangAST.lib
${CLANG_PLATFORM_LIB_PATH}/clangLex.lib
${CLANG_PLATFORM_LIB_PATH}/clangBasic.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMBinaryFormat.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMDebugInfoDWARF.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMMC.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMOption.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMBitReader.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMMCParser.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMProfileData.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMTarget.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMCore.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMSupport.lib
Version.lib
)
cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake
Vendored
-2
View File
@@ -10,9 +10,7 @@
#
set(FILES
AWSGameLiftServerSDK_windows.cmake
BuiltInPackages_windows.cmake
Clang_windows.cmake
Crashpad_windows.cmake
dyad_windows.cmake
FbxSdk_windows.cmake
cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake
Vendored
+1 -1
View File
@@ -26,7 +26,7 @@ ly_associate_package(PACKAGE_NAME lux_core-2.2-rev5-multiplatform TARGETS lux
ly_associate_package(PACKAGE_NAME freetype-2.10.4.14-mac-ios TARGETS freetype PACKAGE_HASH 67b4f57aed92082d3fd7c16aa244a7d908d90122c296b0a63f73e0a0b8761977)
ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-mac-ios TARGETS tiff PACKAGE_HASH a23ae1f8991a29f8e5df09d6d5b00d7768a740f90752cef465558c1768343709)
ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev3-ios TARGETS AWSNativeSDK PACKAGE_HASH 1246219a213ccfff76b526011febf521586d44dbc1753e474f8fb5fd861654a4)
ly_associate_package(PACKAGE_NAME PhysX-4.1.0.25992954-rev1-ios TARGETS PhysX PACKAGE_HASH a2a48a09128337c72b9c2c1b8f43187c6c914e8509c9c6cd91810108748d7e09)
ly_associate_package(PACKAGE_NAME PhysX-4.1.0.25992954-rev2-ios TARGETS PhysX PACKAGE_HASH 27e68bd90915dbd0bd5f26cae714e9a137f6b1aa8a8e0bf354a4a9176aa553d5)
ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-ios TARGETS mikkelsen PACKAGE_HASH 976aaa3ccd8582346132a10af253822ccc5d5bcc9ea5ba44d27848f65ee88a8a)
ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-ios TARGETS googletest PACKAGE_HASH 2f121ad9784c0ab73dfaa58e1fee05440a82a07cc556bec162eeb407688111a7)
ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-ios TARGETS GoogleBenchmark PACKAGE_HASH c2ffaed2b658892b1bcf81dee4b44cd1cb09fc78d55584ef5cb8ab87f2d8d1ae)