Merge branch 'main' into update-mac-x86

Signed-off-by: Mike Chang <changml@amazon.com>
o3de · Aug 20, 2024 · fb2155b · fb2155b
2 parents 7bd19ec + 5137fae
commit fb2155b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 17 deletions.
diff --git a/package-system/AWSNativeSDK/build_AWSNativeSDK_ios.sh b/package-system/AWSNativeSDK/build_AWSNativeSDK_ios.sh
@@ -16,6 +16,7 @@ configure_and_build_static() {
     build_type=$1
 
     echo "CMake Configure $build_type Static"
+    CFLAGS="-DAWS_APPSTORE_SAFE" \
     CXXFLAGS="-Wno-deprecated-declarations -Wno-shorten-64-to-32 -fPIC" \
     cmake -S "$src_path" -B "$bld_path/${build_type}_Static" \
           -DTARGET_ARCH=APPLE \

diff --git a/package-system/AWSNativeSDK/build_config.json b/package-system/AWSNativeSDK/build_config.json
@@ -1,8 +1,8 @@
 {
    "git_url":"https://github.com/aws/aws-sdk-cpp.git",
-   "git_tag":"1.11.288",
+   "git_tag":"1.11.361",
    "package_name":"AWSNativeSDK",
-   "package_version":"1.11.288-rev1",
+   "package_version":"1.11.361-rev1",
    "package_url":"https://github.com/aws/aws-sdk-cpp",
    "package_license":"Apache-2.0",
    "package_license_file":"LICENSE",
@@ -12,7 +12,7 @@
    "Platforms":{
       "Windows":{
          "Windows":{
-            "package_version":"1.11.288-rev1",
+            "package_version":"1.11.361-rev1",
             "cmake_find_source":"FindAWSNativeSDK.cmake.Windows",
             "custom_build_cmd": [
                "build_AWSNativeSDK_windows.cmd"
@@ -22,7 +22,7 @@
             ]
          },
          "Android":{
-            "package_version":"1.11.288-rev2",
+            "package_version":"1.11.361-rev1",
             "depends_on_packages": [
                [ "zlib-1.2.11-rev5-android", "73c9e88892c237a3fc6eafc04268ccd9d479e6d55f9df2ed58b236c8f9cf2cae", "" ]
             ],
@@ -47,7 +47,7 @@
             ]
          },
          "iOS":{
-            "package_version":"1.11.288-rev2",
+            "package_version":"1.11.361-rev1",
             "cmake_find_source":"FindAWSNativeSDK.cmake.iOS",
             "custom_build_cmd": [
                "./build_AWSNativeSDK_ios.sh"
@@ -63,11 +63,11 @@
                [ "OpenSSL-1.1.1t-rev1-linux", "63aea898b7afe8faccd0c7261e62d2f8b7b870f678a4520d5be81e5815542b39", "" ],
                [ "zlib-1.2.11-rev5-linux", "9be5ea85722fc27a8645a9c8a812669d107c68e6baa2ca0740872eaeb6a8b0fc", "" ]
             ],
-            "package_version":"1.11.288-rev1",
+            "package_version":"1.11.361-rev1",
             "cmake_find_source":"FindAWSNativeSDK.cmake.Linux",
             "custom_build_cmd": [
                "./build-linux.sh",
-               "aws_native_sdk_1_11_288",
+               "aws_native_sdk_1_11_361",
                "20.04",
                "curl-7_68_0",
                "x86_64"
@@ -81,11 +81,11 @@
                [ "OpenSSL-1.1.1t-rev1-linux-aarch64", "f32721bec9c82d1bd7fb244d78d5dc4e2a47e7b808bb36027236ad377e241ea5", "" ],
                [ "zlib-1.2.11-rev5-linux-aarch64", "ce9d1ed2883d77ffc69c7982c078595c1f89ca55ec19d89fe7e6beb05f774775", "" ]
             ],
-            "package_version":"1.11.288-rev1",
+            "package_version":"1.11.361-rev1",
             "cmake_find_source":"FindAWSNativeSDK.cmake.Linux",
             "custom_build_cmd": [
                "./build-linux.sh",
-               "aws_native_sdk_1_11_288",
+               "aws_native_sdk_1_11_361",
                "20.04",
                "curl-7_68_0",
                "aarch64"

diff --git a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Linux b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Linux
@@ -21,6 +21,7 @@ add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)
 set(${MY_NAME}_BIN_RUNTIME_DEPENDENCIES
         ${${MY_NAME}_BINARY_DIR}/dxc
         ${${MY_NAME}_BINARY_DIR}/dxc-3.7
+        ${${MY_NAME}_BINARY_DIR}/dxsc
         )
 ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} OUTPUT_SUBDIRECTORY "${output_subfolder}/bin" FILES ${${MY_NAME}_BIN_RUNTIME_DEPENDENCIES})
 

diff --git a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Mac b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Mac
@@ -20,6 +20,7 @@ add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)
 set(${MY_NAME}_BIN_RUNTIME_DEPENDENCIES
         ${${MY_NAME}_BINARY_DIR}/dxc
         ${${MY_NAME}_BINARY_DIR}/dxc-3.7
+        ${${MY_NAME}_BINARY_DIR}/dxsc
         )
 ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} OUTPUT_SUBDIRECTORY "${output_subfolder}/bin" FILES ${${MY_NAME}_BIN_RUNTIME_DEPENDENCIES})
 

diff --git a/package_build_list_host_darwin.json b/package_build_list_host_darwin.json
@@ -5,8 +5,8 @@
     "comment4" : "Note:  Build from source occurs before build_from_folder",
     "build_from_source": {
         "assimp-5.2.5-rev1-mac":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Mac --package-root ../../package-system --clean",
-        "AWSNativeSDK-1.11.288-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Mac --package-root ../../package-system --clean",
-        "AWSNativeSDK-1.11.288-rev2-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name iOS --package-root ../../package-system --clean",
+        "AWSNativeSDK-1.11.361-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Mac --package-root ../../package-system --clean",
+        "AWSNativeSDK-1.11.361-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name iOS --package-root ../../package-system --clean",
         "Lua-5.4.4-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Mac --package-root ../../package-system/Lua/temp --clean",
         "Lua-5.4.4-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name iOS --package-root ../../package-system/Lua/temp --clean",
         "AwsIotDeviceSdkCpp-1.15.2-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Mac --package-root ../../package-system --clean",
@@ -56,8 +56,8 @@
     },
     "build_from_folder": {
         "assimp-5.2.5-rev1-mac": "package-system/assimp-mac",
-        "AWSNativeSDK-1.11.288-rev1-mac": "package-system/AWSNativeSDK-mac",
-        "AWSNativeSDK-1.11.288-rev2-ios": "package-system/AWSNativeSDK-ios",
+        "AWSNativeSDK-1.11.361-rev1-mac": "package-system/AWSNativeSDK-mac",
+        "AWSNativeSDK-1.11.361-rev1-ios": "package-system/AWSNativeSDK-ios",
         "AwsIotDeviceSdkCpp-1.15.2-rev2-mac": "package-system/AwsIotDeviceSdkCpp-mac",
         "Lua-5.4.4-rev1-mac": "package-system/Lua/temp/Lua-mac",
         "Lua-5.4.4-rev1-ios": "package-system/Lua/temp/Lua-ios",

diff --git a/package_build_list_host_windows.json b/package_build_list_host_windows.json
@@ -9,8 +9,8 @@
         "azslc-1.8.20-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Windows --package-root ../../package-system/azslc/temp --clean",
         "AWSGameLiftServerSDK-5.1.2-rev1-windows": "package-system/AWSGameLiftServerSDK/build_package_image.py --platform-name windows",
         "AwsIotDeviceSdkCpp-1.15.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --build-path c:/Temp/awsiot --platform-name Windows --package-root ../../package-system --clean",
-        "AWSNativeSDK-1.11.288-rev2-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --package-root ../../package-system --clean",
-        "AWSNativeSDK-1.11.288-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Windows --package-root ../../package-system --clean",
+        "AWSNativeSDK-1.11.361-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --package-root ../../package-system --clean",
+        "AWSNativeSDK-1.11.361-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Windows --package-root ../../package-system --clean",
         "Blast-v1.1.7_rc2-9-geb169fe-rev2-windows": "package-system/Blast/build_package_image.py --platform-name windows",
         "Crashpad-0.8.0-rev1-windows": "package-system/Crashpad/build_package_image.py",
         "DirectXShaderCompilerDxc-1.7.2308-o3de-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Windows --package-root ../../package-system --clean",
@@ -71,8 +71,8 @@
     "azslc-1.8.20-rev1-windows": "package-system/azslc/temp/azslc-windows",
     "AWSGameLiftServerSDK-5.1.2-rev1-windows": "package-system/AWSGameLiftServerSDK-windows",
     "AwsIotDeviceSdkCpp-1.15.2-rev1-windows": "package-system/AwsIotDeviceSdkCpp-windows",
-    "AWSNativeSDK-1.11.288-rev2-android": "package-system/AWSNativeSDK-android",
-    "AWSNativeSDK-1.11.288-rev1-windows": "package-system/AWSNativeSDK-windows",
+    "AWSNativeSDK-1.11.361-rev1-android": "package-system/AWSNativeSDK-android",
+    "AWSNativeSDK-1.11.361-rev1-windows": "package-system/AWSNativeSDK-windows",
     "Blast-v1.1.7_rc2-9-geb169fe-rev1-windows": "package-system/Blast-windows",
     "cityhash-1.1-multiplatform": "package-system/cityhash-multiplatform",
     "civetweb-1.8-rev1-windows": "package-system/civetweb-windows",