Merge branch 'main' into carlitosan_scripting_first

Gems/Metastream/Code/CMakeLists.txt

@@ -47,7 +47,6 @@ ly_add_target(
         PRIVATE
             Gem::Metastream.Static
             Legacy::CryCommon
-            3rdParty::civetweb
 )
 
 
@@ -74,7 +73,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                 AZ::AzTest
                 Gem::Metastream.Static
                 Legacy::CryCommon
-                3rdParty::civetweb
     )
     ly_add_googletest(
         NAME Gem::Metastream.Tests

Gems/Metastream/Code/Source/Platform/Common/MSVC/metastream_msvc.cmake

@@ -11,3 +11,7 @@
 
 # CivetHttpServer.cpp uses a try catch block
 set(LY_COMPILE_OPTIONS PRIVATE /EHsc)
+set(LY_BUILD_DEPENDENCIES
+    PRIVATE
+        3rdParty::civetweb
+)

cmake/3rdParty/Findcivetweb.cmake

@@ -1,16 +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.
-#
-
-ly_add_external_target(
-    NAME civetweb
-    VERSION civetweb-20160922-az.2
-    INCLUDE_DIRECTORIES include
-)

cmake/3rdParty/Platform/Android/civetweb_android.cmake

@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#

cmake/3rdParty/Platform/Android/cmake_android_files.cmake

@@ -11,7 +11,6 @@
 
 set(FILES
     BuiltInPackages_android.cmake
-    civetweb_android.cmake
     VkValidation_android.cmake
     Wwise_android.cmake
 )

cmake/3rdParty/Platform/Linux/civetweb_linux.cmake

@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#

cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake

@@ -12,7 +12,6 @@
 set(FILES
     AWSGameLiftServerSDK_linux.cmake
     BuiltInPackages_linux.cmake
-    civetweb_linux.cmake
     dyad_linux.cmake
     FbxSdk_linux.cmake
     OpenSSL_linux.cmake

cmake/3rdParty/Platform/Mac/civetweb_mac.cmake

@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#

cmake/3rdParty/Platform/Mac/cmake_mac_files.cmake

@@ -11,7 +11,6 @@
 
 set(FILES
     BuiltInPackages_mac.cmake
-    civetweb_mac.cmake
     DirectXShaderCompiler_mac.cmake
     FbxSdk_mac.cmake
     OpenGLInterface_mac.cmake

cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake

@@ -55,4 +55,5 @@ ly_associate_package(PACKAGE_NAME pyside2-qt-5.15.1-rev2-windows     TARGETS pys
 ly_associate_package(PACKAGE_NAME openimageio-2.1.16.0-rev1-windows  TARGETS OpenImageIO     PACKAGE_HASH b9f6d6df180ad240b9f17a68c1862c7d8f38234de0e692e83116254b0ee467e5)
 ly_associate_package(PACKAGE_NAME qt-5.15.2-windows                  TARGETS Qt              PACKAGE_HASH edaf954c647c99727bfd313dab2959803d2df0873914bb96368c3d8286eed6d9)
 ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-windows   TARGETS libsamplerate   PACKAGE_HASH dcf3c11a96f212a52e2c9241abde5c364ee90b0f32fe6eeb6dcdca01d491829f)
-ly_associate_package(PACKAGE_NAME OpenMesh-8.1-rev1-windows          TARGETS OpenMesh        PACKAGE_HASH 1c1df639358526c368e790dfce40c45cbdfcfb1c9a041b9d7054a8949d88ee77)
+ly_associate_package(PACKAGE_NAME OpenMesh-8.1-rev1-windows          TARGETS OpenMesh        PACKAGE_HASH 1c1df639358526c368e790dfce40c45cbdfcfb1c9a041b9d7054a8949d88ee77)
+ly_associate_package(PACKAGE_NAME civetweb-1.8-rev1-windows          TARGETS civetweb        PACKAGE_HASH 36d0e58a59bcdb4dd70493fb1b177aa0354c945b06c30416348fd326cf323dd4)

cmake/3rdParty/Platform/Windows/civetweb_windows.cmake

@@ -1,13 +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(CIVETWEB_LIBS ${BASE_PATH}/lib/Windows/$<IF:$<CONFIG:Debug>,debug,release>/civetweb.lib)
-

cmake/3rdParty/cmake_files.cmake

@@ -12,7 +12,6 @@
 set(FILES
     BuiltInPackages.cmake
     FindAWSGameLiftServerSDK.cmake
-    Findcivetweb.cmake
     FindClang.cmake
     FindDirectXShaderCompiler.cmake
     Finddyad.cmake

scripts/build/Platform/Android/build_config.json

@@ -44,7 +44,7 @@
     "TAGS": [
       "packaging"
     ],
-    "COMMAND": "python_windows.cmd",
+    "COMMAND": "../Windows/python_windows.cmd",
     "PARAMETERS": {
       "SCRIPT_PATH": "scripts/build/package/package.py",
       "SCRIPT_PARAMETERS": "--platform Android --type all"

scripts/build/package/Platform/3rdParty/package_filelists/3rdParty.json

@@ -3,7 +3,6 @@
         "3rdParty.txt": "#include",
         "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",

scripts/build/package/Platform/Windows/package_filelists/3rdParty.json

@@ -23,12 +23,6 @@
             "bin/windows/**":"#include",
             "lib/linux/libstdcxx/**":"#include"
         },
-        "civetweb/civetweb-20160922-az.2":{
-            "src/**":"#include",
-            "include/**":"#include",
-            "lib/Windows/**":"#include",
-            "*":"#include"
-        },
         "DirectXShaderCompiler/1.0.1-az.1":{
             "*":"#include",
             "src/**":"#include",