Merge remote-tracking branch 'upstream/main' into Assimp_to_3P

Signed-off-by: AMZN-stankowi <[email protected]>

README.md

@@ -2,10 +2,10 @@
 
 This is where the "sources" (ie, build scripts which make packages) for the O3DE package system are located.
 
-Note that the "sources" of most packages are not acutally stored here, most "package sources" actually just consist of a script which fetches the source code (or prebuilt packages) from somewhere else, constructs a temporary folder image for it, and then lets the package system pack that folder up as the package.
+Note that the "sources" of most packages are not actually stored here, most "package sources" actually just consist of a script which fetches the source code (or prebuilt packages) from somewhere else, constructs a temporary folder image for it, and then lets the package system pack that folder up as the package.
 
 In general
- * Add your new pacakge to the appropriate package_build_list_host_xxxx file
+ * Add your new package to the appropriate package_build_list_host_xxxx file
  * Put the scripts or instructions to construct the package image folder into the package-system subfolder
 
 Recommendation would be to make any temp packing in a folder called **/temp/** so as to use the current git ignores.

Scripts/extras/pull_and_build_from_git.py

@@ -501,7 +501,7 @@ class BuildInfo(object):
                     raise BuildError(f"Invalid/missing license file '{self.package_info.package_license_file}' specified in the build config.")
 
             license_file_content = package_license_src.read_text("UTF-8", "ignore")
-            if "Copyright" not in license_file_content and "OPEN 3D ENGINE LICENSING" not in license_file_content:
+            if "Copyright" not in license_file_content and "OPEN 3D ENGINE LICENSING" not in license_file_content and "copyright" not in license_file_content:
                 raise BuildError(f"Unable to find 'Copyright' or the O3DE licensing text in the license file {str(self.package_info.package_license_file)}. Is this a valid license file?")
             target_license_copy = self.build_install_folder / os.path.basename(package_license_src)
             if target_license_copy.is_file():

package-system/.gitignore

@@ -24,3 +24,5 @@ SPIRVCross-*
 tiff-*
 v-hacd-*
 zlib-*
+pybind11-multiplatform
+

package-system/AWSNativeSDK/AWSNativeSDK-1.9.50-windows.patch

@@ -0,0 +1,26 @@
+diff --git a/aws-cpp-sdk-core/include/aws/core/auth/AWSAuthSigner.h b/aws-cpp-sdk-core/include/aws/core/auth/AWSAuthSigner.h
+index 8061ee1e25..591d65555a 100644
+--- a/aws-cpp-sdk-core/include/aws/core/auth/AWSAuthSigner.h
++++ b/aws-cpp-sdk-core/include/aws/core/auth/AWSAuthSigner.h
+@@ -399,6 +399,21 @@ namespace Aws
+              */
+             bool SignRequest(Aws::Http::HttpRequest&) const override { return true; }
+ 
++            /**
++             * Do nothing
++             */
++            bool SignRequest(Aws::Http::HttpRequest&, bool) const override { return true; }
++
++            /**
++             * Do nothing
++             */
++            bool SignRequest(Aws::Http::HttpRequest&, const char*, bool) const override { return true; }
++
++            /**
++             * Do nothing
++             */
++            bool SignRequest(Aws::Http::HttpRequest&, const char*, const char*, bool) const override { return true; }
++
+             /**
+              * Do nothing
+              */

package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Linux

@@ -80,68 +80,40 @@ function(ly_declare_aws_library)
 endfunction()
 
 
-#### Common ####
-if(LY_MONOLITHIC_GAME)
-    ly_declare_aws_library(
-        NAME 
-            Common
-        LIB_FILE 
-            aws-c-common
-    )       
-else()
-    ly_declare_aws_library(
-        NAME 
-            Common
-        LIB_FILE 
-            aws-c-common
-        BUILD_DEPENDENCIES
-            ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common.so.0unstable
-    )       
-endif()
-
-#### Checksums ####
-ly_declare_aws_library(
-    NAME 
-        Checksums
-    LIB_FILE 
-        aws-checksums
+#### Core ####
+set(CORE_STATIC_LIBS
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-crt-cpp.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-s3.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-auth.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-mqtt.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-http.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-event-stream.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-io.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-checksums.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-compression.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-cal.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libs2n.a
 )
 
-#### EventStream ####
 if(LY_MONOLITHIC_GAME)
     ly_declare_aws_library(
         NAME 
-            EventStream
+            Core
         LIB_FILE 
-            aws-c-event-stream
-        BUILD_DEPENDENCIES
-            3rdParty::AWSNativeSDK::Checksums
+            aws-cpp-sdk-core
+        BUILD_DEPENDENCIES 
+            ${CORE_STATIC_LIBS}
     )
 else()
     ly_declare_aws_library(
         NAME 
-            EventStream
+            Core
         LIB_FILE 
-            aws-c-event-stream
-        BUILD_DEPENDENCIES
-            3rdParty::AWSNativeSDK::Checksums
-            ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-event-stream.so.0unstable
-
+            aws-cpp-sdk-core
     )
 endif()
 
-#### Core ####
-ly_declare_aws_library(
-    NAME 
-        Core
-    LIB_FILE 
-        aws-cpp-sdk-core
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::EventStream
-        3rdParty::AWSNativeSDK::Checksums
-        3rdParty::AWSNativeSDK::Common
-)
-
 #### AccessManagement ####
 ly_declare_aws_library(
     NAME 
@@ -274,46 +246,6 @@ ly_declare_aws_library(
 #########
 ######### Grouping Definitions #########
 #########
-
-
-#### Dependencies ####
-ly_declare_aws_library(
-    NAME 
-        Dependencies
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::EventStream
-        3rdParty::AWSNativeSDK::Checksums
-        3rdParty::AWSNativeSDK::Common
-)
-
-#### IdentityMetrics ####
-ly_declare_aws_library(
-    NAME 
-        IdentityMetrics
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::CognitoIdentity
-        3rdParty::AWSNativeSDK::CognitoIdp
-        3rdParty::AWSNativeSDK::IdentityManagement
-        3rdParty::AWSNativeSDK::MobileAnalytics
-        3rdParty::AWSNativeSDK::STS
-        3rdParty::AWSNativeSDK::Core
-        3rdParty::AWSNativeSDK::Dependencies
-)
-
-#### IdentityLambda ####
-ly_declare_aws_library(
-    NAME 
-        IdentityLambda
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::CognitoIdentity
-        3rdParty::AWSNativeSDK::CognitoIdp
-        3rdParty::AWSNativeSDK::IdentityManagement
-        3rdParty::AWSNativeSDK::Lambda
-        3rdParty::AWSNativeSDK::STS
-        3rdParty::AWSNativeSDK::Core
-        3rdParty::AWSNativeSDK::Dependencies
-)
-
 #### GameLiftClient ####
 ly_declare_aws_library(
     NAME 
@@ -321,7 +253,6 @@ ly_declare_aws_library(
     BUILD_DEPENDENCIES 
         3rdParty::AWSNativeSDK::GameLift
         3rdParty::AWSNativeSDK::Core
-        3rdParty::AWSNativeSDK::Dependencies
 )
 
 #### AWSClientAuth ####
@@ -333,7 +264,7 @@ ly_declare_aws_library(
         3rdParty::AWSNativeSDK::CognitoIdp
         3rdParty::AWSNativeSDK::IdentityManagement
         3rdParty::AWSNativeSDK::STS
-        3rdParty::AWSNativeSDK::Dependencies
+        3rdParty::AWSNativeSDK::Core
 )
 
 
@@ -346,7 +277,6 @@ ly_declare_aws_library(
         3rdParty::AWSNativeSDK::Lambda
         3rdParty::AWSNativeSDK::S3
         3rdParty::AWSNativeSDK::Core
-        3rdParty::AWSNativeSDK::Dependencies
 )
 
 

package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Mac

@@ -24,7 +24,9 @@ endif()
 # AWS Compile Definitions
 set(AWSNATIVESDK_COMPILE_DEFINITIONS AWS_CUSTOM_MEMORY_MANAGEMENT PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
 
-set(AWSNATIVESDK_BUILD_DEPENDENCIES
+find_library(SECURITY_FRAMEWORK Security)
+set(AWSNATIVESDK_BUILD_DEPENDENCIES 
+    ${SECURITY_FRAMEWORK} 
     curl # The one bundled with the aws sdk in 3rdParty doesn't use the right openssl
 )
 
@@ -88,76 +90,69 @@ function(ly_declare_aws_library)
 endfunction()
 
 
-#### Common ####
-if(LY_MONOLITHIC_GAME)
-    ly_declare_aws_library(
-        NAME 
-            Common
-        LIB_FILE 
-            aws-c-common
-    )       
-else()
-    ly_declare_aws_library(
-        NAME 
-            Common
-        LIB_FILE 
-            aws-c-common
-        BUILD_DEPENDENCIES
-            ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common${CMAKE_SHARED_LIBRARY_SUFFIX}
-            ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common.0unstable${CMAKE_SHARED_LIBRARY_SUFFIX}
-            ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common.1.0.0${CMAKE_SHARED_LIBRARY_SUFFIX}
-        RUNTIME_DEPENDENCIES
-            ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common.0unstable${CMAKE_SHARED_LIBRARY_SUFFIX}
-            ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common.1.0.0${CMAKE_SHARED_LIBRARY_SUFFIX}
-    )       
-endif()
+#### Core ####
+set(CORE_STATIC_LIBS
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-crt-cpp.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-s3.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-auth.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-mqtt.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-http.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-event-stream.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-io.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-checksums.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-compression.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-cal.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common.a
+)
 
-#### Checksums ####
-ly_declare_aws_library(
-    NAME 
-        Checksums
-    LIB_FILE 
-        aws-checksums
+set(CORE_SHARED_LIBS
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-crt-cpp.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-s3.0unstable.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-s3.1.0.0.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-s3.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-auth.1.0.0.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-auth.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-mqtt.1.0.0.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-mqtt.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-http.1.0.0.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-http.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-event-stream.1.0.0.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-event-stream.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-io.1.0.0.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-io.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-checksums.1.0.0.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-checksums.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-compression.1.0.0.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-compression.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-cal.1.0.0.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-cal.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common.1.0.0.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common.1.dylib
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common.dylib
 )
 
-#### EventStream ####
 if(LY_MONOLITHIC_GAME)
     ly_declare_aws_library(
         NAME 
-            EventStream
+            Core
         LIB_FILE 
-            aws-c-event-stream
-        BUILD_DEPENDENCIES 
-            3rdParty::AWSNativeSDK::Checksums
+            aws-cpp-sdk-core
+        BUILD_DEPENDENCIES
+            ${CORE_STATIC_LIBS}
     )
 else()
     ly_declare_aws_library(
         NAME 
-            EventStream
+            Core
         LIB_FILE 
-            aws-c-event-stream
+            aws-cpp-sdk-core
         BUILD_DEPENDENCIES
-            ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-event-stream${CMAKE_SHARED_LIBRARY_SUFFIX}
-            ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-event-stream.0unstable${CMAKE_SHARED_LIBRARY_SUFFIX}
-            ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-event-stream.1.0.0${CMAKE_SHARED_LIBRARY_SUFFIX}
-            3rdParty::AWSNativeSDK::Checksums
+            ${CORE_SHARED_LIBS}
         RUNTIME_DEPENDENCIES
-            ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-event-stream.0unstable${CMAKE_SHARED_LIBRARY_SUFFIX}
-            ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-event-stream.1.0.0${CMAKE_SHARED_LIBRARY_SUFFIX}
+            ${CORE_SHARED_LIBS}
     )
 endif()
 
-#### Core ####
-ly_declare_aws_library(
-    NAME 
-        Core
-    LIB_FILE 
-        aws-cpp-sdk-core
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Common
-        3rdParty::AWSNativeSDK::EventStream
-)
-
 #### AccessManagement ####
 ly_declare_aws_library(
     NAME 
@@ -290,46 +285,6 @@ ly_declare_aws_library(
 #########
 ######### Grouping Definitions #########
 #########
-
-
-#### Dependencies ####
-ly_declare_aws_library(
-    NAME 
-        Dependencies
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Checksums
-        3rdParty::AWSNativeSDK::Common
-        3rdParty::AWSNativeSDK::EventStream
-)
-
-#### IdentityMetrics ####
-ly_declare_aws_library(
-    NAME 
-        IdentityMetrics
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Dependencies
-        3rdParty::AWSNativeSDK::CognitoIdentity
-        3rdParty::AWSNativeSDK::CognitoIdp
-        3rdParty::AWSNativeSDK::Core
-        3rdParty::AWSNativeSDK::IdentityManagement
-        3rdParty::AWSNativeSDK::STS
-        3rdParty::AWSNativeSDK::MobileAnalytics
-)
-
-#### IdentityLambda ####
-ly_declare_aws_library(
-    NAME 
-        IdentityLambda
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Dependencies
-        3rdParty::AWSNativeSDK::CognitoIdentity
-        3rdParty::AWSNativeSDK::CognitoIdp
-        3rdParty::AWSNativeSDK::Core
-        3rdParty::AWSNativeSDK::IdentityManagement
-        3rdParty::AWSNativeSDK::Lambda
-        3rdParty::AWSNativeSDK::STS
-)
-
 #### GameLiftClient ####
 ly_declare_aws_library(
     NAME 
@@ -337,7 +292,6 @@ ly_declare_aws_library(
     BUILD_DEPENDENCIES 
         3rdParty::AWSNativeSDK::Core
         3rdParty::AWSNativeSDK::GameLift
-        3rdParty::AWSNativeSDK::Dependencies
 )
 
 #### AWSClientAuth ####
@@ -345,7 +299,7 @@ ly_declare_aws_library(
     NAME 
         AWSClientAuth
     BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Dependencies
+        3rdParty::AWSNativeSDK::Core
         3rdParty::AWSNativeSDK::CognitoIdentity
         3rdParty::AWSNativeSDK::CognitoIdp
         3rdParty::AWSNativeSDK::STS
@@ -358,7 +312,6 @@ ly_declare_aws_library(
     NAME 
         AWSCore
     BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Dependencies
         3rdParty::AWSNativeSDK::Core
         3rdParty::AWSNativeSDK::DynamoDB
         3rdParty::AWSNativeSDK::Lambda

package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Windows

@@ -14,40 +14,51 @@ set(AWS_BASE_PATH ${CMAKE_CURRENT_LIST_DIR}/${AWSNATIVESDK_PACKAGE_NAME})
 # Include Path
 set(AWSNATIVESDK_INCLUDE_PATH ${AWS_BASE_PATH}/include)
 
-
 # Determine the lib path and possible bin path
 if (LY_MONOLITHIC_GAME)
-
-    set(AWSNATIVESDK_COMPILE_DEFINITIONS AWS_CUSTOM_MEMORY_MANAGEMENT PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
+    set(AWSNATIVESDK_COMPILE_DEFINITIONS 
+        AWS_CUSTOM_MEMORY_MANAGEMENT 
+        PLATFORM_SUPPORTS_AWS_NATIVE_SDK
+    )
     set(AWSNATIVE_SDK_LIB_PATH ${AWS_BASE_PATH}/lib/$<IF:$<CONFIG:Debug>,Debug,Release>)
-    unset(AWSNATIVE_SDK_BIN_PATH)
-
 else()
-
-    set(AWSNATIVESDK_COMPILE_DEFINITIONS AWS_CUSTOM_MEMORY_MANAGEMENT PLATFORM_SUPPORTS_AWS_NATIVE_SDK USE_IMPORT_EXPORT)
+    set(AWSNATIVESDK_COMPILE_DEFINITIONS 
+        AWS_CUSTOM_MEMORY_MANAGEMENT 
+        PLATFORM_SUPPORTS_AWS_NATIVE_SDK 
+        USE_IMPORT_EXPORT
+        USE_WINDOWS_DLL_SEMANTICS
+        AWS_CRT_CPP_USE_IMPORT_EXPORT
+        AWS_HTTP_USE_IMPORT_EXPORT
+        AWS_IO_USE_IMPORT_EXPORT
+        AWS_USE_IO_COMPLETION_PORTS
+        AWS_COMMON_USE_IMPORT_EXPORT
+        AWS_CAL_USE_IMPORT_EXPORT
+        AWS_COMPRESSION_USE_IMPORT_EXPORT
+        AWS_MQTT_USE_IMPORT_EXPORT
+        AWS_MQTT_WITH_WEBSOCKETS
+        AWS_AUTH_USE_IMPORT_EXPORT
+        AWS_CHECKSUMS_USE_IMPORT_EXPORT
+        AWS_EVENT_STREAM_USE_IMPORT_EXPORT
+        AWS_S3_USE_IMPORT_EXPORT
+    )
     set(AWSNATIVE_SDK_LIB_PATH ${AWS_BASE_PATH}/bin/$<IF:$<CONFIG:Debug>,Debug,Release>)
-    set(AWSNATIVE_SDK_BIN_PATH ${AWS_BASE_PATH}/bin/$<IF:$<CONFIG:Debug>,Debug,Release>)
-
 endif()
 
 # Helper function to define individual AWSNativeSDK Libraries
 function(ly_declare_aws_library)
-
     set(options)
     set(oneValueArgs NAME LIB_FILE)
-    set(multiValueArgs BUILD_DEPENDENCIES)
-    
+    set(multiValueArgs BUILD_DEPENDENCIES RUNTIME_DEPENDENCIES)
+
     cmake_parse_arguments(ly_declare_aws_library "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
     set(TARGET_WITH_NAMESPACE "3rdParty::${AWSNATIVESDK_PACKAGE_NAME}::${ly_declare_aws_library_NAME}")
     if (NOT TARGET ${TARGET_WITH_NAMESPACE})
-
         add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)
 
         ly_target_include_system_directories(TARGET ${TARGET_WITH_NAMESPACE} INTERFACE ${AWSNATIVESDK_INCLUDE_PATH})
 
         if (ly_declare_aws_library_LIB_FILE)
-
             target_link_libraries(${TARGET_WITH_NAMESPACE} 
                 INTERFACE
                     ${AWSNATIVE_SDK_LIB_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}${ly_declare_aws_library_LIB_FILE}${CMAKE_STATIC_LIBRARY_SUFFIX}
@@ -55,69 +66,83 @@ function(ly_declare_aws_library)
             )
 
             if (NOT LY_MONOLITHIC_GAME)
-                ly_add_dependencies(${TARGET_WITH_NAMESPACE} ${AWSNATIVE_SDK_BIN_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${ly_declare_aws_library_LIB_FILE}${CMAKE_SHARED_LIBRARY_SUFFIX})
+                ly_add_dependencies(${TARGET_WITH_NAMESPACE} ${AWSNATIVE_SDK_LIB_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${ly_declare_aws_library_LIB_FILE}${CMAKE_SHARED_LIBRARY_SUFFIX})
+
+                if (ly_declare_aws_library_RUNTIME_DEPENDENCIES)
+                    ly_add_dependencies(${TARGET_WITH_NAMESPACE} ${ly_declare_aws_library_RUNTIME_DEPENDENCIES})
+                endif()
             endif()
-                    
         elseif (ly_declare_aws_library_BUILD_DEPENDENCIES)
             target_link_libraries(${TARGET_WITH_NAMESPACE} 
                 INTERFACE
                     ${ly_declare_aws_library_BUILD_DEPENDENCIES}
             )
         endif()
-        
-        target_link_options(${TARGET_WITH_NAMESPACE} INTERFACE ${AWSNATIVESDK_LINK_OPTIONS})
 
+        target_link_options(${TARGET_WITH_NAMESPACE} INTERFACE ${AWSNATIVESDK_LINK_OPTIONS})
 
         target_compile_definitions(${TARGET_WITH_NAMESPACE} INTERFACE ${AWSNATIVESDK_COMPILE_DEFINITIONS})
 
     endif()
-    
 endfunction()
 
 
-#### Common ####
-ly_declare_aws_library(
-    NAME 
-        Common
-    LIB_FILE 
-        aws-c-common
-    BUILD_DEPENDENCIES
-        Bcrypt.lib
-        Userenv.lib
-        Version.lib
-        Wininet.lib
-        Winhttp.lib
-        Ws2_32.lib            
-)       
-
-#### Checksums ####
-ly_declare_aws_library(
-    NAME 
-        Checksums
-    LIB_FILE 
-        aws-checksums
+#### Core ####
+set(CORE_STATIC_LIBS
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-crt-cpp.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-s3.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-auth.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-mqtt.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-http.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-event-stream.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-io.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-checksums.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-compression.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-cal.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-common.lib
+    Ncrypt
+    Secur32
+    Shlwapi
+    Userenv
+    Wininet
+    Winhttp
 )
 
-#### EventStream ####
-ly_declare_aws_library(
-    NAME 
-        EventStream
-    LIB_FILE 
-        aws-c-event-stream
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Checksums
+set(CORE_SHARED_LIBS
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-crt-cpp.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-s3.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-auth.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-mqtt.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-http.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-event-stream.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-io.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-checksums.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-compression.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-cal.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-common.dll
 )
 
-#### Core ####
-ly_declare_aws_library(
-    NAME 
-        Core
-    LIB_FILE 
-        aws-cpp-sdk-core
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Common
-        3rdParty::AWSNativeSDK::EventStream
-)
+if(LY_MONOLITHIC_GAME)
+    ly_declare_aws_library(
+        NAME 
+            Core
+        LIB_FILE 
+            aws-cpp-sdk-core
+        BUILD_DEPENDENCIES
+            ${CORE_STATIC_LIBS}
+    )
+else()
+    ly_declare_aws_library(
+        NAME 
+            Core
+        LIB_FILE 
+            aws-cpp-sdk-core
+        BUILD_DEPENDENCIES
+            ${CORE_STATIC_LIBS}
+        RUNTIME_DEPENDENCIES
+            ${CORE_SHARED_LIBS}
+    )
+endif()
 
 #### AccessManagement ####
 ly_declare_aws_library(
@@ -251,46 +276,6 @@ ly_declare_aws_library(
 #########
 ######### Grouping Definitions #########
 #########
-
-
-#### Dependencies ####
-ly_declare_aws_library(
-    NAME 
-        Dependencies
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Checksums
-        3rdParty::AWSNativeSDK::Common
-        3rdParty::AWSNativeSDK::EventStream
-)
-
-#### IdentityMetrics ####
-ly_declare_aws_library(
-    NAME 
-        IdentityMetrics
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Dependencies
-        3rdParty::AWSNativeSDK::CognitoIdentity
-        3rdParty::AWSNativeSDK::CognitoIdp
-        3rdParty::AWSNativeSDK::Core
-        3rdParty::AWSNativeSDK::IdentityManagement
-        3rdParty::AWSNativeSDK::STS
-        3rdParty::AWSNativeSDK::MobileAnalytics
-)
-
-#### IdentityLambda ####
-ly_declare_aws_library(
-    NAME 
-        IdentityLambda
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Dependencies
-        3rdParty::AWSNativeSDK::CognitoIdentity
-        3rdParty::AWSNativeSDK::CognitoIdp
-        3rdParty::AWSNativeSDK::Core
-        3rdParty::AWSNativeSDK::IdentityManagement
-        3rdParty::AWSNativeSDK::Lambda
-        3rdParty::AWSNativeSDK::STS
-)
-
 #### GameLiftClient ####
 ly_declare_aws_library(
     NAME 
@@ -298,7 +283,6 @@ ly_declare_aws_library(
     BUILD_DEPENDENCIES 
         3rdParty::AWSNativeSDK::Core
         3rdParty::AWSNativeSDK::GameLift
-        3rdParty::AWSNativeSDK::Dependencies
 )
 
 #### AWSClientAuth ####
@@ -306,7 +290,7 @@ ly_declare_aws_library(
     NAME 
         AWSClientAuth
     BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Dependencies
+        3rdParty::AWSNativeSDK::Core
         3rdParty::AWSNativeSDK::CognitoIdentity
         3rdParty::AWSNativeSDK::CognitoIdp
         3rdParty::AWSNativeSDK::STS
@@ -319,10 +303,8 @@ ly_declare_aws_library(
     NAME 
         AWSCore
     BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Dependencies
         3rdParty::AWSNativeSDK::Core
         3rdParty::AWSNativeSDK::DynamoDB
         3rdParty::AWSNativeSDK::Lambda
         3rdParty::AWSNativeSDK::S3
 )
-

package-system/AWSNativeSDK/build_AWSNativeSDK_linux.sh

@@ -26,6 +26,10 @@ fi
 
 src_path=temp/src
 bld_path=temp/build
+inst_path=temp/install
+
+echo "Command: rm -rf $inst_path"
+rm -rf $inst_path || (echo "Command: rm -rf $inst_path failed" ; exit 1)
 
 configure_and_build() {
     build_type=$1
@@ -37,18 +41,21 @@ configure_and_build() {
     fi
 
     echo "CMake Configure $build_type $lib_type"
-    CC=/usr/lib/llvm-6.0/bin/clang CXX=/usr/lib/llvm-6.0/bin/clang++ cmake -S "$src_path" -B "$bld_path/${build_type}_${lib_type}" \
+    CC=/usr/lib/llvm-12/bin/clang CXX=/usr/lib/llvm-12/bin/clang++ cmake -S "$src_path" -B "$bld_path/${build_type}_${lib_type}" \
           -G "Unix Makefiles" \
           -DTARGET_ARCH=LINUX \
           -DCMAKE_CXX_STANDARD=17 \
+          -DCPP_STANDARD=17 \
+          -DCMAKE_C_FLAGS="-fPIC" \
+          -DCMAKE_CXX_FLAGS="-fPIC" \
           -DENABLE_TESTING=OFF \
           -DENABLE_RTTI=ON \
           -DCUSTOM_MEMORY_MANAGEMENT=ON \
           -DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;mobileanalytics;queues;s3;sns;sqs;sts;transfer" \
           -DBUILD_SHARED_LIBS=$build_shared \
           -DCMAKE_BUILD_TYPE=$build_type \
-          -DCMAKE_INSTALL_BINDIR="bin/$build_type" \
-          -DCMAKE_INSTALL_LIBDIR="lib/$build_type" || (echo "CMake Configure $build_type $lib_type failed" ; exit 1)
+          -DCMAKE_INSTALL_BINDIR="bin" \
+          -DCMAKE_INSTALL_LIBDIR="lib" || (echo "CMake Configure $build_type $lib_type failed" ; exit 1)
 
     echo "CMake Build $build_type $lib_type to $bld_path/${build_type}_${lib_type}"
     cmake --build "$bld_path/${build_type}_${lib_type}" --config $build_type -j 12 || (echo "CMake Build $build_type $lib_type to $bld_path/${build_type}_${lib_type} failed" ; exit 1)

package-system/AWSNativeSDK/build_AWSNativeSDK_mac.sh

@@ -8,6 +8,10 @@
 
 src_path=temp/src
 bld_path=temp/build
+inst_path=temp/install
+
+echo "Command: rm -rf $inst_path"
+rm -rf $inst_path || (echo "Command: rm -rf $inst_path failed" ; exit 1)
 
 configure_and_build() {
     build_type=$1
@@ -19,19 +23,21 @@ configure_and_build() {
     fi
 
     echo "CMake Configure $build_type $lib_type"
-    CXXFLAGS=-Wno-deprecated-declarations cmake -S "$src_path" -B "$bld_path/${build_type}_${lib_type}" \
+    CFLAGS="-Wno-deprecated-declarations -fPIC" CXXFLAGS="-Wno-deprecated-declarations -fPIC" cmake -S "$src_path" -B "$bld_path/${build_type}_${lib_type}" \
           -G "Xcode" \
           -DTARGET_ARCH=APPLE \
           -DCMAKE_OSX_ARCHITECTURES="x86_64" \
+          -DCMAKE_OSX_DEPLOYMENT_TARGET="11.0" \
           -DCMAKE_CXX_STANDARD=17 \
+          -DCPP_STANDARD=17 \
           -DENABLE_TESTING=OFF \
           -DENABLE_RTTI=ON \
           -DCUSTOM_MEMORY_MANAGEMENT=ON \
           -DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;mobileanalytics;queues;s3;sns;sqs;sts;transfer" \
           -DBUILD_SHARED_LIBS=$build_shared \
           -DCMAKE_BUILD_TYPE=$build_type \
-          -DCMAKE_INSTALL_BINDIR="bin/$build_type" \
-          -DCMAKE_INSTALL_LIBDIR="lib/$build_type" || (echo "CMake Configure $build_type $lib_type failed" ; exit 1)
+          -DCMAKE_INSTALL_BINDIR="bin" \
+          -DCMAKE_INSTALL_LIBDIR="lib" || (echo "CMake Configure $build_type $lib_type failed" ; exit 1)
 
     echo "CMake Build $build_type $lib_type to $bld_path/${build_type}_${lib_type}"
     cmake --build "$bld_path/${build_type}_${lib_type}" --config $build_type -j 12 || (echo "CMake Build $build_type $lib_type to $bld_path/${build_type}_${lib_type} failed" ; exit 1)

package-system/AWSNativeSDK/build_AWSNativeSDK_windows.cmd

@@ -8,6 +8,14 @@ REM
 
 SET SRC_PATH=temp\src
 SET BLD_PATH=temp\build
+SET INST_PATH=temp\install
+
+ECHO "Command: rmdir /Q /S %INST_PATH%"
+rmdir /Q /S %INST_PATH%
+IF %ERRORLEVEL% NEQ 0 (
+    ECHO "Command: rmdir /Q /S %INST_PATH% failed"
+    exit /b 1
+)
 
 REM Debug Shared
 call:ConfigureAndBuild Debug Shared
@@ -48,15 +56,17 @@ call cmake -S %SRC_PATH% -B %BLD_PATH%\%BUILD_TYPE%_%LIB_TYPE% ^
            -G "Visual Studio 16 2019" ^
            -A x64 ^
            -DTARGET_ARCH=WINDOWS ^
+           -DCMAKE_CXX_STANDARD=17 ^
            -DCPP_STANDARD=17 ^
            -DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;mobileanalytics;queues;s3;sns;sqs;sts;transfer" ^
            -DENABLE_TESTING=OFF ^
            -DENABLE_RTTI=ON ^
-           -DCUSTOM_MEMORY_MANAGEMENT=ON^
+           -DCUSTOM_MEMORY_MANAGEMENT=ON ^
+           -DFORCE_SHARED_CRT=ON ^
            -DBUILD_SHARED_LIBS=%BUILD_SHARED% ^
            -DCMAKE_BUILD_TYPE="%BUILD_TYPE%" ^
-           -DCMAKE_INSTALL_BINDIR="bin/%BUILD_TYPE%" ^
-           -DCMAKE_INSTALL_LIBDIR="lib/%BUILD_TYPE%"
+           -DCMAKE_INSTALL_BINDIR="bin" ^
+           -DCMAKE_INSTALL_LIBDIR="lib"
 IF %ERRORLEVEL% NEQ 0 (
     ECHO "CMake Configure %BUILD_TYPE% %LIB_TYPE% failed"
     exit /b 1

package-system/AWSNativeSDK/build_config.json

@@ -12,6 +12,9 @@
    "Platforms":{
       "Windows":{
          "Windows":{
+            "git_tag":"1.9.50",
+            "package_version":"1.9.50-rev2",
+            "patch_file":"AWSNativeSDK-1.9.50-windows.patch",
             "cmake_find_source":"FindAWSNativeSDK.cmake.Windows",
             "custom_build_cmd": [
                "build_AWSNativeSDK_windows.cmd"
@@ -34,7 +37,8 @@
       },
       "Darwin":{
          "Mac":{
-            "package_version":"1.7.167-rev6",
+            "git_tag":"1.9.50",
+            "package_version":"1.9.50-rev1",
             "cmake_find_source":"FindAWSNativeSDK.cmake.Mac",
             "custom_build_cmd": [
                "./build_AWSNativeSDK_mac.sh"
@@ -55,7 +59,8 @@
       },
       "Linux":{
          "Linux":{
-            "package_version":"1.7.167-rev6",
+            "git_tag":"1.9.50",
+            "package_version":"1.9.50-rev1",
             "cmake_find_source":"FindAWSNativeSDK.cmake.Linux",
             "custom_build_cmd": [
                "./build_AWSNativeSDK_linux.sh"

package-system/AWSNativeSDK/install_AWSNativeSDK_linux.sh

@@ -24,38 +24,32 @@ mkdir -p $out_lib_path/Release
 copy_shared_and_static_libs() {
     local bld_type=$1
     echo "Copying shared .so to $out_bin_path/$bld_type"
-    cp -f "$inst_path/lib/$bld_type/"*".so"* $out_bin_path/$bld_type/ || (echo "Copying shared .so to $out_bin_path/$bld_type failed" ; exit 1)
-
-    echo "Copying 3rdParty shared .so to $out_bin_path/$bld_type"
-    cp -f "$bld_path/${bld_type}_Shared/.deps/install/lib/"*".so"* $out_bin_path/$bld_type/ || (echo "Copying 3rdParty shared .so to $out_bin_path/$bld_type failed" ; exit 1)
+    cp -f "$inst_path/${bld_type}_Shared/lib/"*".so"* $out_bin_path/$bld_type/ || (echo "Copying shared .so to $out_bin_path/$bld_type failed" ; exit 1)
 
     echo "Copying static .a to $out_lib_path/$bld_type"
-    cp -f "$inst_path/lib/$bld_type/"*".a" $out_lib_path/$bld_type/ || (echo "Copying static .a to $out_lib_path/$bld_type failed" ; exit 1)
-
-    echo "Copying 3rdParty static .a to $out_lib_path/$bld_type"
-    cp -f "$bld_path/${bld_type}_Static/.deps/install/lib/"*".a" $out_lib_path/$bld_type/ || (echo "Copying 3rdParty static .a to $out_lib_path/$bld_type failed" ; exit 1)
+    cp -f "$inst_path/${bld_type}_Static/lib/"*".a" $out_lib_path/$bld_type/ || (echo "Copying static .a to $out_lib_path/$bld_type failed" ; exit 1)
 }
 
 # Debug
 echo "CMake Install Debug Shared to $inst_path"
-cmake --install $bld_path/Debug_Shared --prefix $inst_path --config Debug || (echo "CMake Install Debug Shared to $inst_path failed" ; exit 1)
+cmake --install $bld_path/Debug_Shared --prefix $inst_path/Debug_Shared --config Debug || (echo "CMake Install Debug Shared to $inst_path failed" ; exit 1)
 
 echo "CMake Install Debug Static to $inst_path"
-cmake --install $bld_path/Debug_Static --prefix $inst_path --config Debug || (echo "CMake Install Debug Static to $inst_path failed" ; exit 1)
+cmake --install $bld_path/Debug_Static --prefix $inst_path/Debug_Static --config Debug || (echo "CMake Install Debug Static to $inst_path failed" ; exit 1)
 
 copy_shared_and_static_libs Debug || exit 1
 
 # Release
 echo "CMake Install Release Shared to $inst_path"
-cmake --install $bld_path/Release_Shared --prefix $inst_path --config Release || (echo "CMake Install Release Shared to $inst_path failed" ; exit 1)
+cmake --install $bld_path/Release_Shared --prefix $inst_path/Release_Shared --config Release || (echo "CMake Install Release Shared to $inst_path failed" ; exit 1)
 
 echo "CMake Install Release Static to $inst_path"
-cmake --install $bld_path/Release_Static --prefix $inst_path --config Release || (echo "CMake Install Release Static to $inst_path failed" ; exit 1)
+cmake --install $bld_path/Release_Static --prefix $inst_path/Release_Static --config Release || (echo "CMake Install Release Static to $inst_path failed" ; exit 1)
 
 copy_shared_and_static_libs Release || exit 1
 
 echo "Copying include headers to $out_include_path"
-cp -f -R "$inst_path/include/"* $out_include_path/ || (echo "Copying include headers to $out_include_path failed" ; exit 1)
+cp -f -R "$inst_path/Release_Static/include/"* $out_include_path/ || (echo "Copying include headers to $out_include_path failed" ; exit 1)
 
 echo "Copying LICENSE.txt to $TARGET_INSTALL_ROOT"
 cp -f $src_path/LICENSE.txt $TARGET_INSTALL_ROOT/ || (echo "Copying LICENSE.txt to $TARGET_INSTALL_ROOT failed" ; exit 1)

package-system/AWSNativeSDK/install_AWSNativeSDK_mac.sh

@@ -24,41 +24,35 @@ mkdir -p $out_lib_path/Release
 copy_shared_and_static_libs() {
     local bld_type=$1
     echo "Copying shared .dylib to $out_bin_path/$bld_type"
-    cp -f "$inst_path/lib/$bld_type/"*".dylib" $out_bin_path/$bld_type/ || (echo "Copying shared .dylib to $out_bin_path/$bld_type failed" ; exit 1)
-
-    echo "Copying 3rdParty shared .dylib to $out_bin_path/$bld_type"
-    cp -f "$bld_path/${bld_type}_Shared/.deps/install/lib/"*".dylib" $out_bin_path/$bld_type/ || (echo "Copying 3rdParty shared .dylib to $out_bin_path/$bld_type failed" ; exit 1)
+    cp -f "$inst_path/${bld_type}_Shared/lib/"*".dylib" $out_bin_path/$bld_type/ || (echo "Copying shared .dylib to $out_bin_path/$bld_type failed" ; exit 1)
 
     echo "Copying static .a to $out_lib_path/$bld_type"
-    cp -f "$inst_path/lib/$bld_type/"*".a" $out_lib_path/$bld_type/ || (echo "Copying static .a to $out_lib_path/$bld_type failed" ; exit 1)
-
-    echo "Copying 3rdParty static .a to $out_lib_path/$bld_type"
-    cp -f "$bld_path/${bld_type}_Static/.deps/install/lib/"*".a" $out_lib_path/$bld_type/ || (echo "Copying 3rdParty static .a to $out_lib_path/$bld_type failed" ; exit 1)
+    cp -f "$inst_path/${bld_type}_Static/lib/"*".a" $out_lib_path/$bld_type/ || (echo "Copying static .a to $out_lib_path/$bld_type failed" ; exit 1)
 }
 
 # Debug
 echo "CMake Install Debug Shared to $inst_path"
-cmake --install $bld_path/Debug_Shared --prefix $inst_path --config Debug || (echo "CMake Install Debug Shared to $inst_path failed" ; exit 1)
+cmake --install $bld_path/Debug_Shared --prefix $inst_path/Debug_Shared --config Debug || (echo "CMake Install Debug Shared to $inst_path failed" ; exit 1)
 
 echo "CMake Install Debug Static to $inst_path"
-cmake --install $bld_path/Debug_Static --prefix $inst_path --config Debug || (echo "CMake Install Debug Static to $inst_path failed" ; exit 1)
+cmake --install $bld_path/Debug_Static --prefix $inst_path/Debug_Static --config Debug || (echo "CMake Install Debug Static to $inst_path failed" ; exit 1)
 
 copy_shared_and_static_libs Debug || exit 1
 
 # Release
 echo "CMake Install Release Shared to $inst_path"
-cmake --install $bld_path/Release_Shared --prefix $inst_path --config Release || (echo "CMake Install Release Shared to $inst_path failed" ; exit 1)
+cmake --install $bld_path/Release_Shared --prefix $inst_path/Release_Shared --config Release || (echo "CMake Install Release Shared to $inst_path failed" ; exit 1)
 
 echo "CMake Install Release Static to $inst_path"
-cmake --install $bld_path/Release_Static --prefix $inst_path --config Release || (echo "CMake Install Release Static to $inst_path failed" ; exit 1)
+cmake --install $bld_path/Release_Static --prefix $inst_path/Release_Static --config Release || (echo "CMake Install Release Static to $inst_path failed" ; exit 1)
 
 copy_shared_and_static_libs Release || exit 1
 
 echo "Copying include headers to $out_include_path"
-cp -f -R "$inst_path/include/"* $out_include_path/ || (echo "Copying include headers to $out_include_path failed" ; exit 1)
+cp -f -R "$inst_path/Release_Static/include/"* $out_include_path/ || (echo "Copying include headers to $out_include_path failed" ; exit 1)
 
 echo "Copying LICENSE.txt to $TARGET_INSTALL_ROOT"
 cp -f $src_path/LICENSE.txt $TARGET_INSTALL_ROOT/ || (echo "Copying LICENSE.txt to $TARGET_INSTALL_ROOT failed" ; exit 1)
 
 echo "Custom Install for AWSNativeSDK finished successfully"
-exit 0
+exit 0

package-system/AWSNativeSDK/install_AWSNativeSDK_windows.cmd

@@ -23,18 +23,19 @@ mkdir %OUT_LIB_PATH%\Release
 
 REM CMake Install Debug and 3rdParty
 ECHO "CMake Install Debug Shared to %INST_PATH%"
-call cmake --install %BLD_PATH%\Debug_Shared --prefix %INST_PATH% --config Debug
+call cmake --install %BLD_PATH%\Debug_Shared --prefix %INST_PATH%\Debug_Shared --config Debug
 IF %ERRORLEVEL% NEQ 0 (
-    ECHO "CMake Install Debug Shared to %INST_PATH% failed"
+    ECHO "CMake Install Debug Shared to %INST_PATH%\Debug_Shared failed"
     exit /b 1
 )
 
 ECHO "CMake Install Debug Static to %INST_PATH%"
-call cmake --install %BLD_PATH%\Debug_Static --prefix %INST_PATH% --config Debug
+call cmake --install %BLD_PATH%\Debug_Static --prefix %INST_PATH%\Debug_Static --config Debug
 IF %ERRORLEVEL% NEQ 0 (
-    ECHO "CMake Install Debug Static to %INST_PATH% failed"
+    ECHO "CMake Install Debug Static to %INST_PATH%\Debug_Static failed"
     exit /b 1
 )
+
 call:CopyDynamicAndStaticLibs "Debug"
 IF %ERRORLEVEL% NEQ 0 (
     exit /b 1
@@ -42,18 +43,19 @@ IF %ERRORLEVEL% NEQ 0 (
 
 REM CMake Install Release and 3rdParty
 ECHO "CMake Install Release Shared to %INST_PATH%"
-call cmake --install %BLD_PATH%\Release_Shared --prefix %INST_PATH% --config Release
+call cmake --install %BLD_PATH%\Release_Shared --prefix %INST_PATH%\Release_Shared --config Release
 IF %ERRORLEVEL% NEQ 0 (
-    ECHO "CMake Install Release Shared to %INST_PATH% failed"
+    ECHO "CMake Install Release Shared to %INST_PATH%\Release_Shared failed"
     exit /b 1
 )
 
 ECHO "CMake Install Release Static to %INST_PATH%"
-call cmake --install %BLD_PATH%\Release_Static --prefix %INST_PATH% --config Release
+call cmake --install %BLD_PATH%\Release_Static --prefix %INST_PATH%\Release_Static --config Release
 IF %ERRORLEVEL% NEQ 0 (
-    ECHO "CMake Install Release Static to %INST_PATH% failed"
+    ECHO "CMake Install Release Static to %INST_PATH%\Release_Static failed"
     exit /b 1
 )
+
 call:CopyDynamicAndStaticLibs "Release"
 IF %ERRORLEVEL% NEQ 0 (
     exit /b 1
@@ -61,7 +63,7 @@ IF %ERRORLEVEL% NEQ 0 (
 
 REM Copy include headers
 ECHO "Copying include headers to %OUT_INCLUDE_PATH%"
-Xcopy %INST_PATH%\include\* %OUT_INCLUDE_PATH% /E /Y
+Xcopy %INST_PATH%\Release_Static\include\* %OUT_INCLUDE_PATH% /E /Y
 IF %ERRORLEVEL% NEQ 0 (
     ECHO "Copying include headers to %OUT_INCLUDE_PATH% failed"
     exit /b 1
@@ -81,44 +83,29 @@ exit /b 0
 :CopyDynamicAndStaticLibs
 SET BUILD_TYPE=%~1
 ECHO "Copying shared .dlls to %OUT_BIN_PATH%\%BUILD_TYPE%"
-copy /Y %INST_PATH%\bin\%BUILD_TYPE%\*.dll %OUT_BIN_PATH%\%BUILD_TYPE%\
+copy /Y %INST_PATH%\%BUILD_TYPE%_Shared\bin\*.dll %OUT_BIN_PATH%\%BUILD_TYPE%\
 IF %ERRORLEVEL% NEQ 0 (
     ECHO "Copying shared .dlls to %OUT_BIN_PATH%\%BUILD_TYPE% failed"
     exit /b 1
 )
 
 ECHO "Copying shared .libs to %OUT_BIN_PATH%\%BUILD_TYPE%"
-copy /Y %INST_PATH%\bin\%BUILD_TYPE%\*.lib %OUT_BIN_PATH%\%BUILD_TYPE%\
+copy /Y %INST_PATH%\%BUILD_TYPE%_Shared\bin\*.lib %OUT_BIN_PATH%\%BUILD_TYPE%\
 IF %ERRORLEVEL% NEQ 0 (
     ECHO "Copying shared .libs to %OUT_BIN_PATH%\%BUILD_TYPE% failed"
     exit /b 1
 )
 
-ECHO "Copying 3rdParty shared .dlls to %OUT_BIN_PATH%\%BUILD_TYPE%"
-copy /Y %BLD_PATH%\%BUILD_TYPE%_Shared\.deps\install\bin\*.dll %OUT_BIN_PATH%\%BUILD_TYPE%\
-IF %ERRORLEVEL% NEQ 0 (
-    ECHO "Copying 3rdParty shared .dlls to %OUT_BIN_PATH%\%BUILD_TYPE% failed"
-    exit /b 1
-)
-
-ECHO "Copying 3rdParty shared .libs to %OUT_BIN_PATH%\%BUILD_TYPE%"
-copy /Y %BLD_PATH%\%BUILD_TYPE%_Shared\.deps\install\lib\*.lib %OUT_BIN_PATH%\%BUILD_TYPE%\
+copy /Y %INST_PATH%\%BUILD_TYPE%_Shared\lib\*.lib %OUT_BIN_PATH%\%BUILD_TYPE%\
 IF %ERRORLEVEL% NEQ 0 (
-    ECHO "Copying 3rdParty shared .libs to %OUT_BIN_PATH%\%BUILD_TYPE% failed"
+    ECHO "Copying shared .libs to %OUT_BIN_PATH%\%BUILD_TYPE% failed"
     exit /b 1
 )
 
 ECHO "Copying static .libs to %OUT_LIB_PATH%\%BUILD_TYPE%"
-copy /Y %INST_PATH%\lib\%BUILD_TYPE%\*.lib %OUT_LIB_PATH%\%BUILD_TYPE%\
+copy /Y %INST_PATH%\%BUILD_TYPE%_Static\lib\*.lib %OUT_LIB_PATH%\%BUILD_TYPE%\
 IF %ERRORLEVEL% NEQ 0 (
     ECHO "Copying static .libs to %OUT_LIB_PATH%\%BUILD_TYPE% failed"
     exit /b 1
 )
-
-ECHO "Copying 3rdParty static .libs to %OUT_LIB_PATH%\%BUILD_TYPE%"
-copy /Y %BLD_PATH%\%BUILD_TYPE%_Static\.deps\install\lib\*.lib %OUT_LIB_PATH%\%BUILD_TYPE%\
-IF %ERRORLEVEL% NEQ 0 (
-    ECHO "Copying 3rdParty static .libs to %OUT_LIB_PATH%\%BUILD_TYPE% failed"
-    exit /b 1
-)
 GOTO:EOF

package-system/Lua/FindLua.cmake

@@ -0,0 +1,31 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+# 
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+# this file actually ingests the library and defines targets.
+set(TARGET_WITH_NAMESPACE "3rdParty::Lua")
+if (TARGET ${TARGET_WITH_NAMESPACE})
+    return()
+endif()
+
+set(MY_NAME "Lua")
+
+set(${MY_NAME}_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/Lua/include)
+set(${MY_NAME}_LIBS_DIR ${CMAKE_CURRENT_LIST_DIR}/Lua/lib)
+set(${MY_NAME}_LIBRARY ${${MY_NAME}_LIBS_DIR}/release/${CMAKE_STATIC_LIBRARY_PREFIX}lualib${CMAKE_STATIC_LIBRARY_SUFFIX})
+
+add_library(${TARGET_WITH_NAMESPACE} STATIC IMPORTED GLOBAL)
+
+set_target_properties(${TARGET_WITH_NAMESPACE} PROPERTIES IMPORTED_LOCATION "${${MY_NAME}_LIBRARY}")
+
+ly_target_include_system_directories(TARGET ${TARGET_WITH_NAMESPACE} INTERFACE ${${MY_NAME}_INCLUDE_DIR})
+
+target_link_libraries(${TARGET_WITH_NAMESPACE} 
+    INTERFACE ${CMAKE_DL_LIBS}
+)
+
+set(${MY_NAME}_FOUND True)

package-system/Lua/FindLua.cmake.template

@@ -1,35 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-# this file actually ingests the library and defines targets.
-set(TARGET_WITH_NAMESPACE "3rdParty::Lua")
-if (TARGET $${TARGET_WITH_NAMESPACE})
-    return()
-endif()
-
-set(MY_NAME "Lua")
-
-set($${MY_NAME}_INCLUDE_DIR $${CMAKE_CURRENT_LIST_DIR}/Lua/include)
-set($${MY_NAME}_LIBS_DIR $${CMAKE_CURRENT_LIST_DIR}/Lua/lib)
-
-set($${MY_NAME}_LIBRARY_DEBUG   $${$${MY_NAME}_LIBS_DIR}/debug/$${CMAKE_STATIC_LIBRARY_PREFIX}lualib$${CMAKE_STATIC_LIBRARY_SUFFIX})
-set($${MY_NAME}_LIBRARY_RELEASE $${$${MY_NAME}_LIBS_DIR}/release/$${CMAKE_STATIC_LIBRARY_PREFIX}lualib$${CMAKE_STATIC_LIBRARY_SUFFIX})
-
-# we set it to a generator expression for multi-config situations:
-set($${MY_NAME}_LIBRARY  
-    "$$<$$<CONFIG:profile>:$${$${MY_NAME}_LIBRARY_RELEASE}>"
-    "$$<$$<CONFIG:Release>:$${$${MY_NAME}_LIBRARY_RELEASE}>"
-    "$$<$$<CONFIG:Debug>:$${$${MY_NAME}_LIBRARY_DEBUG}>")
-
-add_library($${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)
-ly_target_include_system_directories(TARGET $${TARGET_WITH_NAMESPACE} INTERFACE $${$${MY_NAME}_INCLUDE_DIR})
-target_link_libraries($${TARGET_WITH_NAMESPACE} 
-    INTERFACE $${$${MY_NAME}_LIBRARY}
-)
-
-set($${MY_NAME}_FOUND True)

package-system/Lua/build_config.json

@@ -2,11 +2,11 @@
    "git_url":"https://github.com/lua/lua.git",
    "git_tag":"v5.3.5",
    "package_name":"Lua",
-   "package_version":"5.3.5-rev5",
+   "package_version":"5.3.5-rev7",
    "package_url":"https://github.com/lua/lua",
    "package_license":"MIT",
    "package_license_file":"LICENSE.txt",
-   "cmake_find_template":"FindLua.cmake.template",
+   "cmake_find_source":"FindLua.cmake",
    "cmake_find_target":"FindLua.cmake",
    "patch_file":"lua_5.3.5_amzn.patch",
    "additional_src_files":[
@@ -16,25 +16,20 @@
    "Platforms":{
       "Windows":{
          "Windows":{
+            "build_configs":[
+               "Release"
+            ],
             "cmake_generate_args":[
                "-G",
                "\"Visual Studio 15 Win64\"",
                "-DCMAKE_C_FLAGS=\"-D_CRT_SECURE_NO_WARNINGS\""
-            ],
-            "cmake_build_args":[
-               "-j"
             ]
          },
          "Android":{
-            "cmake_generate_args_debug":[
-               "-G",
-               "Ninja",
-               "-DCMAKE_TOOLCHAIN_FILE=%LY_ANDROID_NDK_ROOT%\\build\\cmake\\android.toolchain.cmake",
-               "-DANDROID_ABI=arm64-v8a",
-               "-DCMAKE_C_FLAGS=\"-fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2\"",
-               "-DCMAKE_BUILD_TYPE=Debug"
+            "build_configs":[
+               "Release"
             ],
-            "cmake_generate_args_release":[
+            "cmake_generate_args":[
                "-G",
                "Ninja",
                "-DCMAKE_TOOLCHAIN_FILE=%LY_ANDROID_NDK_ROOT%\\build\\cmake\\android.toolchain.cmake",
@@ -46,20 +41,21 @@
       },
       "Darwin":{
          "Mac":{
-            "package_version":"5.3.5-rev6",
+            "build_configs":[
+               "Release"
+            ],
             "cmake_generate_args":[
                "-G",
                "Xcode",
                "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12",
                "-DCMAKE_OSX_ARCHITECTURES=x86_64",
                "-DCMAKE_C_FLAGS=\"-fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2 -DLUA_USE_MACOSX\""
-            ],
-            "cmake_build_args":[
-               "-j",
-               "8"
             ]
          },
          "iOS":{
+            "build_configs":[
+               "Release"
+            ],
             "custom_cmake_install":true,
             "cmake_generate_args":[
                "-G",
@@ -67,31 +63,22 @@
                "-DCMAKE_SYSTEM_NAME=iOS",
                "-DCMAKE_OSX_ARCHITECTURES=arm64",
                "-DCMAKE_THREAD_LIBS_INIT=-pthread",
+               "-DCMAKE_OSX_DEPLOYMENT_TARGET=13.0",
                "-DCMAKE_C_FLAGS=\"-fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2\""
-            ],
-            "cmake_build_args":[
             ]
          }
       },
       "Linux":{
          "Linux":{
-            "cmake_generate_args_debug":[
-               "-G",
-               "Unix\\ Makefiles",
-               "-DCMAKE_C_COMPILER=gcc",
-               "-DCMAKE_C_FLAGS=\"-fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2 -DLUA_USE_LINUX\"",
-               "-DCMAKE_BUILD_TYPE=Debug"
+            "build_configs":[
+               "Release"
             ],
-            "cmake_generate_args_release":[
+            "cmake_generate_args":[
                "-G",
                "Unix\\ Makefiles",
                "-DCMAKE_C_COMPILER=gcc",
                "-DCMAKE_C_FLAGS=\"-fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2 -DLUA_USE_LINUX\"",
                "-DCMAKE_BUILD_TYPE=Release"
-            ],
-            "cmake_build_args":[
-               "-j",
-               "4"
             ]
          }
       }

package-system/pybind11/Findpybind11.cmake

@@ -0,0 +1,24 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+
+# this file actually ingests the library and defines targets.
+set(TARGET_WITH_NAMESPACE "3rdParty::pybind11")
+if (TARGET ${TARGET_WITH_NAMESPACE})
+    return()
+endif()
+
+set(LIB_NAME "pybind11")
+set(${LIB_NAME}_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/pybind11/include)
+add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)
+
+ly_target_include_system_directories(TARGET ${TARGET_WITH_NAMESPACE} INTERFACE ${${LIB_NAME}_INCLUDE_DIR})
+
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    target_compile_options(3rdParty::pybind11 INTERFACE -fsized-deallocation)
+endif()
+
+set(${LIB_NAME}_FOUND True)

package-system/pybind11/build_config.json

@@ -0,0 +1,21 @@
+{
+    "git_url":"https://github.com/pybind/pybind11",
+    "git_tag":"v2.4.3",
+    "git_commit":"80d452484c5409444b0ec19383faa84bb7a4d351",
+    "package_name":"pybind11",
+    "package_version":"2.4.3-rev3",
+    "package_url":"https://github.com/pybind/pybind11",
+    "package_license":"BSD-3-Clause",
+    "package_license_file":"pybind11/LICENSE",
+    "cmake_find_source":"Findpybind11.cmake",
+    "cmake_find_target":"Findpybind11.cmake",
+    "Platforms":{
+        "Windows": {
+            "multiplatform":{
+                "cmake_generate_args": [
+                    "-DPYBIND11_TEST=0"
+                ]
+            }
+        }
+    }
+}

package-system/sqlite/FindSQLite.cmake

@@ -0,0 +1,31 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+# 
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+# this file actually ingests the library and defines targets.
+set(TARGET_WITH_NAMESPACE "3rdParty::SQLite")
+if (TARGET ${TARGET_WITH_NAMESPACE})
+    return()
+endif()
+
+set(MY_NAME "SQLite")
+
+
+set(${MY_NAME}_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/SQLite)
+set(${MY_NAME}_LIBS_DIR ${CMAKE_CURRENT_LIST_DIR}/SQLite/lib)
+set(${MY_NAME}_LIBRARY ${${MY_NAME}_LIBS_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}sqlite3${CMAKE_STATIC_LIBRARY_SUFFIX})
+
+add_library(${TARGET_WITH_NAMESPACE} STATIC IMPORTED GLOBAL)
+
+set_target_properties(${TARGET_WITH_NAMESPACE} PROPERTIES IMPORTED_LOCATION "${${MY_NAME}_LIBRARY}")
+
+ly_target_include_system_directories(TARGET ${TARGET_WITH_NAMESPACE} INTERFACE ${${MY_NAME}_INCLUDE_DIR})
+
+target_link_libraries(${TARGET_WITH_NAMESPACE} 
+                      INTERFACE ${CMAKE_DL_LIBS})
+
+set(${MY_NAME}_FOUND True)

package-system/sqlite/build_config.json

@@ -0,0 +1,46 @@
+{
+   "git_url":"https://github.com/sqlite/sqlite.git",
+   "git_tag":"version-3.32.2",
+   "package_name":"SQLite",
+   "package_version":"3.32.2-rev1",
+   "package_url":"https://www.sqlite.org",
+   "package_license":"CUSTOM",
+   "package_license_file":"copyright.txt",
+   "cmake_find_source":"FindSQLite.cmake",
+   "cmake_find_target":"FindSQLite.cmake",
+   "additional_src_files":[
+      "copyright.txt"
+   ],
+   "Platforms":{
+      "Windows":{
+         "Windows":{
+            "custom_build_cmd": [
+               "build_windows.cmd"
+            ],
+            "custom_install_cmd": [
+               "package_windows.cmd"
+            ]
+         }
+      },
+      "Darwin":{
+         "Mac":{
+            "custom_build_cmd": [
+               "./build_unix_like.sh"
+            ],
+            "custom_install_cmd": [
+               "./package_unix_like.sh"
+            ]
+         }
+      },
+      "Linux":{
+         "Linux":{
+            "custom_build_cmd": [
+               "./build_unix_like.sh"
+            ],
+            "custom_install_cmd": [
+               "./package_unix_like.sh"
+            ]
+         }
+      }
+   }
+}

package-system/sqlite/build_unix_like.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+# 
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+
+BUILD_FOLDER=$TEMP_FOLDER/build
+
+
+# TEMP_FOLDER and TARGET_INSTALL_ROOT get set from the pull_and_build_from_git.py script
+echo Building source
+pushd $TEMP_FOLDER/build
+
+# Run configure 
+../src/configure --enable-debug=no --disable-tcl --enable-shared=no --prefix=$TEMP_FOLDER/install --with-pic=yes
+if [ $? -ne 0 ]
+then
+    echo "Unable to configure sqlite" >&2
+    exit 1
+fi
+
+# Run the make and build
+make
+if [ $? -ne 0 ]
+then
+    echo "Unable to build sqlite" >&2
+    exit 1
+fi
+
+# Install to a temp install folder
+make install
+if [ $? -ne 0 ]
+then
+    echo "Unable to install sqlite (release)" >&2
+    exit 1
+fi
+
+popd
+
+exit 0

package-system/sqlite/build_windows.cmd

@@ -0,0 +1,31 @@
+@echo off
+REM
+REM 
+REM Copyright (c) Contributors to the Open 3D Engine Project.
+REM For complete copyright and license terms please see the LICENSE at the root of this distribution.
+REM 
+REM SPDX-License-Identifier: Apache-2.0 OR MIT
+REM 
+REM 
+
+SET SRC_PATH=%TEMP_FOLDER%\src
+SET BLD_PATH=%TEMP_FOLDER%\build
+
+
+ECHO In order to build sqlite for windows, you must have the visual studio command environment
+ECHO setup by running the appropriate vcvars.bat. You also need tclsh installed and in the system 
+ECHO path as tcl is required to build for windows
+
+
+cd %BLD_PATH%
+
+REM Build the release library
+call nmake /f ..\src\Makefile.msc TOP=..\src libsqlite3.lib DEBUG=0
+IF %ERRORLEVEL% NEQ 0 (
+    ECHO "nmake for debug Command Failed"
+    exit /b 1
+)
+
+ECHO Build Successful
+
+exit /b 0

package-system/sqlite/copyright.txt

@@ -0,0 +1,27 @@
+SQLite Is Public Domain
+
+All of the code and documentation in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.
+
+The previous paragraph applies to the deliverable code and documentation in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Some scripts used as part of the build process (for example the "configure" scripts generated by autoconf) might fall under other open-source licenses. Nothing from these build scripts ever reaches the final deliverable SQLite library, however, and so the licenses associated with those scripts should not be a factor in assessing your rights to copy and use the SQLite library.
+
+All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects.
+
+Open-Source, not Open-Contribution
+SQLite is open-source, meaning that you can make as many copies of it as you want and do whatever you want with those copies, without limitation. But SQLite is not open-contribution. In order to keep SQLite in the public domain and ensure that the code does not become contaminated with proprietary or licensed content, the project does not accept patches from unknown persons.
+
+All of the code in SQLite is original, having been written specifically for use by SQLite. No code has been copied from unknown sources on the internet.
+
+Warranty of Title
+SQLite is in the public domain and does not require a license. Even so, some organizations want legal proof of their right to use SQLite. Circumstances where this occurs include the following:
+
+Your company desires indemnity against claims of copyright infringement.
+You are using SQLite in a jurisdiction that does not recognize the public domain.
+You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain.
+You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite.
+Your legal department tells you that you have to purchase a license.
+If any of the above circumstances apply to you, Hwaci, the company that employs all the developers of SQLite, will sell you a Warranty of Title for SQLite. A Warranty of Title is a legal document that asserts that the claimed authors of SQLite are the true authors, and that the authors have the legal right to dedicate the SQLite to the public domain, and that Hwaci will vigorously defend against challenges to those claims. All proceeds from the sale of SQLite Warranties of Title are used to fund continuing improvement and support of SQLite.
+
+Contributed Code
+In order to keep SQLite completely free and unencumbered by copyright, the project does not accept patches. If you would like to make a suggested change, and include a patch as a proof-of-concept, that would be great. However please do not be offended if we rewrite your patch from scratch.
+
+This copyright can be found at https://www.sqlite.org/copyright.html

package-system/sqlite/package_unix_like.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+# 
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+
+PACKAGE_BASE=$TARGET_INSTALL_ROOT
+
+INSTALL_SOURCE=$TEMP_FOLDER/build
+
+cp $TEMP_FOLDER/src/copyright.txt $PACKAGE_BASE/
+
+# Copy extra source files just for reference
+cp $INSTALL_SOURCE/shell.c $PACKAGE_BASE/
+cp $INSTALL_SOURCE/sqlite3.c $PACKAGE_BASE/
+
+# Copy the header files
+cp $INSTALL_SOURCE/sqlite3ext.h $PACKAGE_BASE/
+cp $INSTALL_SOURCE/sqlite3.h $PACKAGE_BASE/
+
+# Copy the debug and release static libraries
+mkdir $PACKAGE_BASE/lib
+
+mkdir $PACKAGE_BASE/lib
+cp $TEMP_FOLDER/install/lib/libsqlite3.a $PACKAGE_BASE/lib/
+cp $TEMP_FOLDER/install/lib/libsqlite3.la $PACKAGE_BASE/lib/
+cp -r $TEMP_FOLDER/install/lib/pkgconfig $PACKAGE_BASE/lib/
+
+exit 0

package-system/sqlite/package_windows.cmd

@@ -0,0 +1,30 @@
+ @echo off
+
+REM Copyright (c) Contributors to the Open 3D Engine Project.
+REM For complete copyright and license terms please see the LICENSE at the root of this distribution.
+REM 
+REM SPDX-License-Identifier: Apache-2.0 OR MIT
+REM
+
+
+SET PACKAGE_BASE=%TARGET_INSTALL_ROOT%
+SET BLD_PATH=%TEMP_FOLDER%\build
+
+SET INSTALL_SOURCE=%TEMP_FOLDER%\build
+
+cp %TEMP_FOLDER%\src\copyright.txt %PACKAGE_BASE%\
+
+REM Copy extra source files just for reference
+cp %INSTALL_SOURCE%\shell.c %PACKAGE_BASE%\
+cp %INSTALL_SOURCE%\sqlite3.c %PACKAGE_BASE%\
+
+REM Copy the header files
+cp %INSTALL_SOURCE%\sqlite3ext.h %PACKAGE_BASE%\
+cp %INSTALL_SOURCE%\sqlite3.h %PACKAGE_BASE%\
+
+REM Copy the static library
+mkdir %PACKAGE_BASE%\lib
+copy %TEMP_FOLDER%\build\libsqlite3.lib %PACKAGE_BASE%\lib\sqlite3.lib
+
+exit /b 0
+

package_build_list_host_darwin.json

@@ -5,10 +5,10 @@
     "comment4" : "Note:  Build from source occurs before build_from_folder",
     "build_from_source": {
         "assimp-5.0.1-rev12-mac":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Mac --package-root ../../package-system --clean",
-        "AWSNativeSDK-1.7.167-rev6-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Mac --package-root ../../package-system --clean",
+        "AWSNativeSDK-1.9.50-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Mac --package-root ../../package-system --clean",
         "AWSNativeSDK-1.7.167-rev4-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name iOS --package-root ../../package-system --clean",
-        "Lua-5.3.5-rev6-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Mac --package-root ../../package-system --clean",
-        "Lua-5.3.5-rev5-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name iOS --package-root ../../package-system --clean",
+        "Lua-5.3.5-rev7-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Mac --package-root ../../package-system --clean",
+        "Lua-5.3.5-rev7-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name iOS --package-root ../../package-system --clean",
         "AwsIotDeviceSdkCpp-1.12.2-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Mac --package-root ../../package-system --clean",
         "freetype-2.10.4.16-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Mac --package-root ../../package-system --clean",
         "freetype-2.10.4.16-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name iOS --package-root ../../package-system --clean",
@@ -32,6 +32,7 @@
         "poly2tri-7f0487a-rev1-mac": "package-system/poly2tri/build_package_image.py --platform-name mac",
         "v-hacd-2.3-1a49edf-rev1-mac": "package-system/v-hacd/build_package_image.py --platform-name mac",
         "SPIRVCross-2021.04.29-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Mac --package-root ../../package-system --clean",
+        "SQLite-3.32.2-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Mac --package-root ../../package-system --clean",
         "squish-ccr-deb557d-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Mac --package-root ../../package-system --clean",
         "astc-encoder-3.2-rev5-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Mac --package-root ../../package-system --clean",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Mac --package-root ../../package-system --clean",
@@ -50,10 +51,10 @@
     },
     "build_from_folder": {
         "assimp-5.0.1-rev12-mac": "package-system/assimp-mac",
-        "AWSNativeSDK-1.7.167-rev6-mac": "package-system/AWSNativeSDK-mac",
+        "AWSNativeSDK-1.9.50-rev1-mac": "package-system/AWSNativeSDK-mac",
         "AWSNativeSDK-1.7.167-rev4-ios": "package-system/AWSNativeSDK-ios",
-        "Lua-5.3.5-rev6-mac": "package-system/Lua-mac",
-        "Lua-5.3.5-rev5-ios": "package-system/Lua-ios",
+        "Lua-5.3.5-rev7-mac": "package-system/Lua-mac",
+        "Lua-5.3.5-rev7-ios": "package-system/Lua-ios",
         "AwsIotDeviceSdkCpp-1.12.2-rev1-mac": "package-system/AwsIotDeviceSdkCpp-mac",
         "freetype-2.10.4.16-mac": "package-system/freetype-mac",
         "freetype-2.10.4.16-ios": "package-system/freetype-ios",
@@ -88,7 +89,7 @@
         "astc-encoder-3.2-rev5-mac": "package-system/astc-encoder-mac",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-mac": "package-system/DirectXShaderCompilerDxc-mac",
         "azslc-1.7.34-rev1-mac": "package-system/azslc-mac",
-        "SQLite-3.32.2-rev3-multiplatform": "package-system/SQLite-multiplatform",
+        "SQLite-3.32.2-rev1-mac": "package-system/SQLite-mac",
         "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
         "qt-5.15.2-rev5-mac": "package-system/qt-mac",
         "zlib-1.2.11-rev5-mac": "package-system/zlib-mac",

package_build_list_host_linux.json

@@ -5,8 +5,8 @@
     "comment4" : "Note:  Build from source occurs before build_from_folder",
     "build_from_source": {
         "assimp-5.0.1-rev12-linux":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Linux --package-root ../../package-system --clean",
-        "AWSNativeSDK-1.7.167-rev6-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux --package-root ../../package-system --clean",
-        "Lua-5.3.5-rev5-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Linux --package-root ../../package-system --clean",
+        "AWSNativeSDK-1.9.50-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux --package-root ../../package-system --clean",
+        "Lua-5.3.5-rev7-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Linux --package-root ../../package-system --clean",
         "AwsIotDeviceSdkCpp-1.12.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Linux --package-root ../../package-system --clean",
         "freetype-2.10.4.16-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Linux --package-root ../../package-system --clean",
         "googlebenchmark-1.5.0-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Linux --package-root ../../package-system --clean",
@@ -24,6 +24,7 @@
         "poly2tri-7f0487a-rev1-linux": "package-system/poly2tri/build_package_image.py --platform-name linux",
         "v-hacd-2.3-1a49edf-rev1-linux": "package-system/v-hacd/build_package_image.py --platform-name linux",
         "SPIRVCross-2021.04.29-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Linux --package-root ../../package-system --clean",
+        "SQLite-3.32.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Linux --package-root ../../package-system --clean",
         "squish-ccr-deb557d-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Linux --package-root ../../package-system --clean",
         "astc-encoder-3.2-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Linux --package-root ../../package-system --clean",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Linux --package-root ../../package-system --clean",
@@ -38,8 +39,8 @@
     "build_from_folder": {
         "assimp-5.0.1-rev12-linux": "package-system/assimp-linux",
         "AWSGameLiftServerSDK-3.4.1-rev1-linux": "package-system/AWSGameLiftServerSDK/linux",
-        "AWSNativeSDK-1.7.167-rev6-linux": "package-system/AWSNativeSDK-linux",
-        "Lua-5.3.5-rev5-linux": "package-system/Lua-linux",
+        "AWSNativeSDK-1.9.50-rev1-linux": "package-system/AWSNativeSDK-linux",
+        "Lua-5.3.5-rev7-linux": "package-system/Lua-linux",
         "AwsIotDeviceSdkCpp-1.12.2-rev1-linux": "package-system/AwsIotDeviceSdkCpp-linux",
         "freetype-2.10.4.16-linux": "package-system/freetype-linux",
         "googlebenchmark-1.5.0-rev2-linux": "package-system/googlebenchmark-linux",
@@ -65,7 +66,7 @@
         "poly2tri-7f0487a-rev1-linux": "package-system/poly2tri-linux",
         "v-hacd-2.3-1a49edf-rev1-linux": "package-system/v-hacd-linux",
         "unwind-1.2.1-linux": "package-system/unwind-linux",
-        "SQLite-3.32.2-rev3-multiplatform": "package-system/SQLite-multiplatform",
+        "SQLite-3.32.2-rev1-linux": "package-system/SQLite-linux",
         "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
         "qt-5.15.2-rev5-linux": "package-system/qt-linux",
         "zlib-1.2.11-rev5-linux": "package-system/zlib-linux",

package_build_list_host_windows.json

@@ -3,14 +3,14 @@
     "comment2" : "build_from_source is package name --> build script to call with params",
     "comment3" : "build_from_folder is package name --> folder containing built image of package",
     "comment4" : "Note:  Build from source occurs before build_from_folder",
-    "build_from_source" : {
+    "build_from_source": {
         "assimp-5.0.1-rev12-windows":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Windows --package-root ../../package-system --clean",
-        "AWSNativeSDK-1.7.167-rev4-windows" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Windows --package-root ../../package-system --clean",
-        "AWSNativeSDK-1.9.50-rev1-android" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --package-root ../../package-system --clean",
+        "AWSNativeSDK-1.9.50-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Windows --package-root ../../package-system --clean",
+        "AWSNativeSDK-1.9.50-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --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",
-        "Lua-5.3.5-rev5-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Windows --package-root ../../package-system --clean",
-        "Lua-5.3.5-rev5-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Android --package-root ../../package-system --clean",
+        "Lua-5.3.5-rev7-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Windows --package-root ../../package-system --clean",
+        "Lua-5.3.5-rev7-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Android --package-root ../../package-system --clean",
         "AwsIotDeviceSdkCpp-1.12.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",
         "AwsIotDeviceSdkCpp-1.12.2-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --build-path c:/Temp/awsiot --platform-name Android --package-root ../../package-system --clean",
         "freetype-2.10.4.16-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Windows --package-root ../../package-system --clean",
@@ -30,6 +30,7 @@
         "OpenSSL-1.1.1b-rev1-android": "package-system/OpenSSL/build_package_image.py --platform-name android",
         "ilmbase-2.3.0-rev4-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenEXR --platform-name Windows --package-root ../../package-system --clean",
         "SPIRVCross-2021.04.29-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Windows --package-root ../../package-system --clean",
+        "SQLite-3.32.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Windows --package-root ../../package-system --clean",
         "squish-ccr-deb557d-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Windows --package-root ../../package-system --clean",
         "astc-encoder-3.2-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Windows --package-root ../../package-system --clean",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Windows --package-root ../../package-system --clean",
@@ -42,6 +43,7 @@
         "RapidJSON-1.1.0-rev1-multiplatform": "Scripts/extras/pull_and_build_from_git.py ../../package-system/RapidJSON --platform-name multiplatform --package-root ../../package-system",
         "v-hacd-2.3-1a49edf-rev1-windows": "package-system/v-hacd/build_package_image.py --platform-name windows",
         "python-3.7.10-rev2-windows": "package-system/python/build_package_image.py",
+        "pybind11-2.4.3-rev3-multiplatform": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pybind11 --platform-name multiplatform --package-root ../../package-system --clean",
         "mikkelsen-1.0.0.4-windows": "package-system/mikkelsen/build_package_image.py",
         "mikkelsen-1.0.0.4-android": "package-system/mikkelsen/build_package_image.py --platform android",
         "qt-5.15.2-rev4-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Windows --package-root ../../package-system --clean",
@@ -52,12 +54,12 @@
     "assimp-5.0.1-rev12-windows": "package-system/assimp-windows",
     "astc-encoder-3.2-rev2-windows": "package-system/astc-encoder-windows",
     "AWSGameLiftServerSDK-3.4.1-rev1-windows": "package-system/AWSGameLiftServerSDK/windows",
-    "AWSNativeSDK-1.7.167-rev3-windows": "package-system/AWSNativeSDK-windows",
-    "AWSNativeSDK-1.7.167-rev6-android": "package-system/AWSNativeSDK-android",
+    "AWSNativeSDK-1.9.50-rev2-windows": "package-system/AWSNativeSDK-windows",
+    "AWSNativeSDK-1.9.50-rev1-android": "package-system/AWSNativeSDK-android",
     "Blast-v1.1.7_rc2-9-geb169fe-rev1-windows": "package-system/Blast-windows",
     "Crashpad-0.8.0-rev1-windows": "package-system/Crashpad-windows",
-    "Lua-5.3.5-rev5-windows": "package-system/Lua-windows",
-    "Lua-5.3.5-rev5-android": "package-system/Lua-android",
+    "Lua-5.3.5-rev7-windows": "package-system/Lua-windows",
+    "Lua-5.3.5-rev7-android": "package-system/Lua-android",
     "AwsIotDeviceSdkCpp-1.12.2-rev1-windows": "package-system/AwsIotDeviceSdkCpp-windows",
     "AwsIotDeviceSdkCpp-1.12.2-rev1-android": "package-system/AwsIotDeviceSdkCpp-android",
     "etc2comp-9cd0f9cae0-rev1-windows": "package-system/etc2comp-windows",
@@ -78,7 +80,7 @@
     "tiff-4.2.0.14-windows": "package-system/tiff-windows",
     "lux_core-2.2-rev5-multiplatform": "package-system/luxcore-multiplatform",
     "python-3.7.10-rev1-windows": "package-system/python/win_x64/package",
-    "pybind11-2.4.3-rev1-multiplatform": "package-system/pybind11-multiplatform",
+    "pybind11-2.4.3-rev3-multiplatform": "package-system/pybind11-multiplatform",
     "alembic-1.7.11-rev3-multiplatform": "package-system/alembic-multiplatform",
     "hdf5-1.0.11-rev2-multiplatform": "package-system/hdf5-multiplatform",
     "ilmbase-2.3.0-rev4-multiplatform": "package-system/ilmbase-multiplatform",
@@ -108,7 +110,7 @@
     "DirectXShaderCompilerDxc-1.6.2104-o3de-rev2-windows": "package-system/DirectXShaderCompilerDxc-windows",
     "azslc-1.7.23-rev2-windows": "package-system/azslc-windows",
     "zstd-1.35-multiplatform": "package-system/zstd-multiplatform",
-    "SQLite-3.32.2-rev3-multiplatform": "package-system/SQLite-multiplatform",
+    "SQLite-3.32.2-rev1-windows": "package-system/SQLite-windows",
     "glad-2.0.0-beta-rev2-multiplatform": "package-system/glad-multiplatform",
     "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
     "PVRTexTool-4.24.0-rev4-multiplatform": "package-system/PVRTexTool-multiplatform",