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/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/Mac/civetweb_mac.cmake → cmake/3rdParty/Platform/Mac/OpenGLInterface_mac.cmake
Vendored
+3
View File
@@ -8,3 +8,6 @@
# 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.
#
# MacOS 10.14 deprecates OpenGL. This silences the warnings for now.
set(OPENGLINTERFACE_COMPILE_DEFINITIONS GL_SILENCE_DEPRECATION)
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
)