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

Integrating github/staging through commit 5f214be

Browse Source
This commit is contained in:
alexpete
2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/build/package/Platform/3rdParty/package_filelists/3rdParty.json
Vendored
+1 -1
View File
@@ -4,6 +4,7 @@
"AWS/AWSNativeSDK/1.7.167-az.2/**": "#include",
"AWS/GameLift/3.4.0/**": "#include",
"civetweb/civetweb-20160922-az.2/**": "#include",
"CMake/3.19.1/**": "#include",
"DirectXShaderCompiler/1.0.1-az.1/**": "#include",
"DirectXShaderCompiler/2020.08.07/**": "#include",
"DirectXShaderCompiler/5.0.0-az/**": "#include",
@@ -13,7 +14,6 @@
"FbxSdk/2016.1.2-az.1/**": "#include",
"libav/11.7/**": "#include",
"OpenSSL/1.1.1b-noasm-az/**": "#include",
"Qt/5.15.1.2-az/**": "#include",
"RadTelemetry/3.5.0.17/**": "#include",
"tiff/3.9.5-az.3/**": "#include",
scripts/build/package/Platform/Mac/package_env.json
+13 -1
View File
@@ -1,5 +1,7 @@
{
"local_env": {},
"local_env": {
"S3_PREFIX": "${BRANCH_NAME}/Mac"
},
"types":{
"all":{
"PACKAGE_TARGETS":[
@@ -7,6 +9,16 @@
"FILE_LIST": "all.json",
"FILE_LIST_TYPE": "All",
"PACKAGE_NAME": "${PACKAGE_NAME_PATTERN}-mac-all-${BUILD_NUMBER}.zip"
},
{
"FILE_LIST": "3rdParty.json",
"FILE_LIST_TYPE": "Mac",
"PACKAGE_NAME": "${PACKAGE_NAME_PATTERN}-mac-3rdParty-${BUILD_NUMBER}.zip"
},
{
"FILE_LIST": "3rdParty.json",
"FILE_LIST_TYPE": "3rdParty",
"PACKAGE_NAME": "${PACKAGE_NAME_PATTERN}-mac-3rdParty-Warsaw-${BUILD_NUMBER}.zip"
}
],
"BOOTSTRAP_CFG_GAME_FOLDER":"CMakeTestbed",
scripts/build/package/Platform/Mac/package_filelists/3rdParty.json
+82
View File
@@ -0,0 +1,82 @@
{
"@3rdParty":{
"3rdParty.txt":"#include",
"AWS/AWSNativeSDK/1.7.167-az.2":{
"*":"#include",
"include/**":"#include",
"LICENSE*":"#include",
"lib/mac/**":"#include",
"bin/mac/**":"#include",
"lib/ios/**":"#include",
"bin/ios/**":"#include"
},
"DirectXShaderCompiler/1.0.1-az.1":{
"*":"#include",
"src/**":"#include",
"bin/darwin_x64/**":"#include"
},
"DirectXShaderCompiler/2020.08.07":{
"*":"#include",
"bin/darwin_x64/**":"#include"
},
"DirectXShaderCompiler/5.0.0-az":{
"*":"#include",
"bin/darwin_x64/**":"#include"
},
"etc2comp/2017_04_24-az.2":{
"*":"#include",
"EtcLib/Etc/**":"#include",
"EtcLib/EtcCodec/**":"#include",
"EtcLib/*":"#include",
"EtcLib/OSX_x86/**":"#include"
},
"expat/2.1.0-pkg.3":{
"*":"#include",
"amiga/**":"#include",
"bcb5/**":"#include",
"conftools/**":"#include",
"doc/**":"#include",
"examples/**":"#include",
"lib/**":"#include",
"m4/**":"#include",
"tests/**":"#include",
"vms/**":"#include",
"win32/**":"#include",
"xmlwf/**":"#include",
"build/osx/**":"#include"
},
"FreeType2/2.5.0.1-pkg.3":{
"freetype-2.5.0.1/**":"#include",
"dist/**":"#include",
"mac/**":"#include",
"ios*/**":"#include",
"build/osx/**":"#include"
},
"Redistributables/FbxSdk/2016.1.2":{
"*mac*":"#include"
},
"OpenSSL/1.1.1b-noasm-az":{
"include/**":"#include",
"ssl/**":"#include",
"LICENSE":"#include",
"bin/**":"#include",
"lib/darwin*/**":"#include",
"lib/ios*/**":"#include"
},
"Qt/5.15.1.2-az":{
"LICENSE":"#include",
"LGPL_EXCEPTION.TXT":"#include",
"LICENSE.GPLV3":"#include",
"LICENSE.LGPLV3":"#include",
"QT-NOTICE.TXT":"#include",
"clang_64/**":"#include"
},
"tiff/3.9.5-az.3":{
"COPYRIGHT":"#include",
"README":"#include",
"RELEASE-DATE":"#include",
"VERSION":"#include",
"libtiff/macosx_clang/**":"#include"
}
}
}