Update ZLIBs minimum ios, android and osx req level (#48)

Also adds those versions to toolchain files so that other 3p can just use the toolchain
file instead of having to specify it each time.

Signed-off-by: lawsonamzn <[email protected]>

Scripts/cmake/Platform/Android/Toolchain_android.cmake

@@ -11,10 +11,17 @@ if(LY_TOOLCHAIN_NDK_API_LEVEL)
 endif()
 
 # Verify that the NDK environment is set and points to the support NDK
+if(NOT LY_NDK_DIR) # prefer CMAKE VARIABLE over ENV VAR but fall back to env var
+    set(LY_NDK_DIR "$ENV{LY_NDK_DIR}")
+endif()
+
+if(NOT LY_NDK_DIR) #if neither cmake variable or env var set, try a commonly set one
+    set(LY_NDK_DIR "$ENV{ANDROID_NDK_ROOT}")
+endif()
 
 file(TO_CMAKE_PATH "${LY_NDK_DIR}" LY_NDK_DIR)
 if(NOT LY_NDK_DIR)
-    message(FATAL_ERROR "Environment var for NDK is empty. Could not find the NDK installation folder")
+    message(FATAL_ERROR "Environment var LY_NDK_DIR is not set.  Could not find the NDK installation folder")
 endif()
 
 set(LY_ANDROID_NDK_TOOLCHAIN ${LY_NDK_DIR}/build/cmake/android.toolchain.cmake)
@@ -37,6 +44,8 @@ if(NOT ANDROID_NATIVE_API_LEVEL)
     set(ANDROID_NATIVE_API_LEVEL 21)
 endif()
 
+set(CMAKE_C_FLAGS "-fPIC")
+set(CMAKE_CXX_FLAGS "-fPIC")
 
 # Make a backup of the CMAKE_FIND_ROOT_PATH since it will be altered by the NDK toolchain file and needs to be restored after the input
 set(BACKUP_CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH})

Scripts/cmake/Platform/Mac/Toolchain_mac.cmake

@@ -0,0 +1,18 @@
+
+#
+# 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 just exists to provide a place to put defaults that should be present 
+# in all 3p packages so that they don't have to seperately define this for each one.
+
+set(CMAKE_SYSTEM_NAME Darwin)
+set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "The minimum OSX Version to support" FORCE)
+set(CMAKE_C_FLAGS "-fPIC")
+set(CMAKE_CXX_FLAGS "-fPIC")
+
+# cmake will auto-select the rest.

Scripts/cmake/Platform/iOS/Toolchain_ios.cmake

@@ -18,3 +18,7 @@ set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
 
 set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE NO)
 
+set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "14.0" CACHE STRING "The minimum IOS Version to support" FORCE)
+
+set(CMAKE_C_FLAGS "-fPIC")
+set(CMAKE_CXX_FLAGS "-fPIC")

package-system/zlib/FindZLIB.cmake

@@ -0,0 +1,64 @@
+#
+# 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
+#
+#
+
+# the following is like an include guard
+set(TARGET_WITH_NAMESPACE "3rdParty::ZLIB")
+if (TARGET ${TARGET_WITH_NAMESPACE})
+    return()
+endif()
+
+# note that we mimic the behavior or the FindZLIB.cmake that ships with CMake.
+# as such, we declare several variables that other 3rdParty Packages which call
+# find_package(ZLIB) might be expecting even if O3DE itself does not use them.
+# this allows the ZLIB package we make to be usable as a drop in replacement
+# for other third parties that want to use this ZLIB - all you need to do is
+# set your CMAKE_MODULE_PATH to the place this package lives and then 
+# calls to find_package(ZLIB) will result in this one being used.
+
+# variables required from FindZLIB.cmake in CMake source:
+
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+    set(ZLIB_LIBRARIES ${CMAKE_CURRENT_LIST_DIR}/zlib/lib/zlibstatic.lib)
+else()
+    set(ZLIB_LIBRARIES ${CMAKE_CURRENT_LIST_DIR}/zlib/lib/libz.a)
+endif()
+
+set(ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/zlib/include)
+set(ZLIB_INCLUDE_DIR ${ZLIB_INCLUDE_DIRS})
+set(ZLIB_LIBRARY ${ZLIB_LIBRARIES})
+set(ZLIB_VERSION_STRING "1.2.11")
+set(ZLIB_VERSION_MAJOR "1")
+set(ZLIB_VERSION_MINOR "2")
+set(ZLIB_VERSION_PATCH "11")
+set(ZLIB_MAJOR_VERSION "1")
+set(ZLIB_MINOR_VERSION "2")
+set(ZLIB_PATCH_VERSION "11")
+set(ZLIB_FOUND True)
+
+# declare the targets - O3DE has the 3rdParty namespace target, CMake has ZLIB::ZLIB
+add_library(${TARGET_WITH_NAMESPACE} STATIC IMPORTED GLOBAL)
+add_library(ZLIB::ZLIB ALIAS ${TARGET_WITH_NAMESPACE})
+
+# cmake < 3.21 and visual studio < 16.10 don't properly implement SYSTEM includes
+# so we use O3DEs patched implementation if it is available and fallback to default if not.
+if (COMMAND ly_target_include_system_directories)
+    ly_target_include_system_directories(TARGET ${TARGET_WITH_NAMESPACE} INTERFACE ${ZLIB_INCLUDE_DIR})
+else()
+    target_include_directories(${TARGET_WITH_NAMESPACE} SYSTEM INTERFACE ${ZLIB_INCLUDE_DIR})
+endif()
+
+# set the library file as the imported location so that things know to link to it:
+set_target_properties(${TARGET_WITH_NAMESPACE} PROPERTIES IMPORTED_LOCATION "${ZLIB_LIBRARY}")
+
+# if we're not in O3DE, it's also extremely helpful to show a message to logs that indicate that this
+# library was successfully picked up, as opposed to the system one.
+# A good way to know if you're in O3DE or not is that O3DE sets various cache variables before 
+# calling find_package, specifically, LY_VERSION_ENGINE_NAME is always set very early:
+if (NOT LY_VERSION_ENGINE_NAME)
+    message(STATUS "Using the O3DE version of the ZLIB library from ${CMAKE_CURRENT_LIST_DIR}")
+endif()

package-system/zlib/FindZLIB_compat_unixlike.cmake

@@ -1,31 +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 is provided to give compatibility to non-o3de-projects
-# it defines the same targets as is defined in the default FindZLIB.cmake
-# shipped with CMAKE.
-# Its meant to be deployed into the zlib subfolder of the package
-# and then allows you set the variable ZLIB_ROOT on the command line to point at this folder,
-# to force it to use this package instead of system ZLIB. 
-
-set(ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/include)
-set(ZLIB_INCLUDE_DIR ${ZLIB_INCLUDE_DIRS})
-set(ZLIB_LIBRARIES ${CMAKE_CURRENT_LIST_DIR}/lib/libz.a)
-set(ZLIB_LIBRARY ${ZLIB_LIBRARIES})
-set(ZLIB_FOUND True)
-set(ZLIB_VERSION_STRING "1.2.11")
-set(ZLIB_VERSION_MAJOR "1")
-set(ZLIB_VERSION_MINOR "2")
-set(ZLIB_VERSION_PATCH "11")
-set(ZLIB_MAJOR_VERSION "1")
-set(ZLIB_MINOR_VERSION "2")
-set(ZLIB_PATCH_VERSION "11")
-
-add_library(ZLIB::ZLIB INTERFACE IMPORTED GLOBAL)
-set_target_properties(ZLIB::ZLIB PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}")
-target_link_libraries(ZLIB::ZLIB INTERFACE ${ZLIB_LIBRARIES})

package-system/zlib/FindZLIB_compat_windows.cmake

@@ -1,31 +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 is provided to give compatibility to non-o3de-projects
-# it defines the same targets as is defined in the default FindZLIB.cmake
-# shipped with CMAKE.
-# Its meant to be deployed into the zlib subfolder of the package
-# and then allows you set the variable ZLIB_ROOT on the command line to point at this folder,
-# to force it to use this package instead of system ZLIB.
-
-set(ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/include)
-set(ZLIB_INCLUDE_DIR ${ZLIB_INCLUDE_DIRS})
-set(ZLIB_LIBRARIES ${CMAKE_CURRENT_LIST_DIR}/lib/zlibstatic.lib)
-set(ZLIB_LIBRARY ${ZLIB_LIBRARIES})
-set(ZLIB_FOUND True)
-set(ZLIB_VERSION_STRING "1.2.11")
-set(ZLIB_VERSION_MAJOR "1")
-set(ZLIB_VERSION_MINOR "2")
-set(ZLIB_VERSION_PATCH "11")
-set(ZLIB_MAJOR_VERSION "1")
-set(ZLIB_MINOR_VERSION "2")
-set(ZLIB_PATCH_VERSION "11")
-
-add_library(ZLIB::ZLIB INTERFACE IMPORTED GLOBAL)
-set_target_properties(ZLIB::ZLIB PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}")
-target_link_libraries(ZLIB::ZLIB INTERFACE ${ZLIB_LIBRARIES})

package-system/zlib/Findzlib.cmake

@@ -1,44 +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::zlib")
-if (TARGET ${TARGET_WITH_NAMESPACE})
-    return()
-endif()
-
-set(zlib_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/zlib/include)
-set(zlib_LIBS_DIR ${CMAKE_CURRENT_LIST_DIR}/zlib/lib)
-
-if (${PAL_PLATFORM_NAME} STREQUAL "Linux")
-    set(zlib_LIBRARY_DEBUG   ${zlib_LIBS_DIR}/libz.a)
-    set(zlib_LIBRARY_RELEASE ${zlib_LIBS_DIR}/libz.a)
-elseif(${PAL_PLATFORM_NAME} STREQUAL "Android")
-    set(zlib_LIBRARY_DEBUG   ${zlib_LIBS_DIR}/libz.a)
-    set(zlib_LIBRARY_RELEASE ${zlib_LIBS_DIR}/libz.a)
-elseif(${PAL_PLATFORM_NAME} STREQUAL "Windows")
-    set(zlib_LIBRARY_DEBUG   ${zlib_LIBS_DIR}/zlibstaticd.lib)
-    set(zlib_LIBRARY_RELEASE ${zlib_LIBS_DIR}/zlibstatic.lib)
-elseif(${PAL_PLATFORM_NAME} STREQUAL "Mac")
-    set(zlib_LIBRARY_DEBUG   ${zlib_LIBS_DIR}/libz.a)
-    set(zlib_LIBRARY_RELEASE ${zlib_LIBS_DIR}/libz.a)
-elseif(${PAL_PLATFORM_NAME} STREQUAL "iOS")
-    set(zlib_LIBRARY_DEBUG   ${zlib_LIBS_DIR}/libz.a)
-    set(zlib_LIBRARY_RELEASE ${zlib_LIBS_DIR}/libz.a)
-endif()
-
-# we set it to a generator expression for multi-config situations:
-set(zlib_LIBRARY                  "$<$<CONFIG:profile>:${zlib_LIBRARY_RELEASE}>")
-set(zlib_LIBRARY ${zlib_LIBRARY} "$<$<CONFIG:Release>:${zlib_LIBRARY_RELEASE}>")
-set(zlib_LIBRARY ${zlib_LIBRARY} "$<$<CONFIG:Debug>:${zlib_LIBRARY_DEBUG}>")
-
-add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)
-ly_target_include_system_directories(TARGET ${TARGET_WITH_NAMESPACE} INTERFACE ${zlib_INCLUDE_DIR})
-target_link_libraries(${TARGET_WITH_NAMESPACE} INTERFACE ${zlib_LIBRARY})
-
-set(zlib_FOUND True)

package-system/zlib/PackageInfo.json

@@ -1,6 +0,0 @@
-{
-    "PackageName" : "zlib-1.2.11-rev2-multiplatform",
-    "URL"         : "https://zlib.net",
-    "License"     : "zlib",
-    "LicenseFile" : "zlib/LICENSE"
-}

package-system/zlib/build_config.json

@@ -3,16 +3,15 @@
     "git_tag":"v1.2.11",
     "git_commit":"cacf7f1d4e3d44d871b605da3b647f07d718623f",
     "package_name":"zlib",
-    "package_version":"1.2.11-rev2",
+    "package_version":"1.2.11-rev5",
     "package_url":"https://zlib.net",
     "package_license":"Zlib",
     "additional_src_files":[
       "LICENSE"
     ],
     "package_license_file":"LICENSE",
-    "cmake_find_source":"Findzlib.cmake",
-    "cmake_find_target":"Findzlib.cmake",
-    "cmake_build_args" : [ "-j", "8"],
+    "cmake_find_source":"FindZLIB.cmake",
+    "cmake_find_target":"FindZLIB.cmake",
     "Platforms":{
         "Windows":{
             "Windows":{

package-system/zlib/build_zlib_android.cmd

@@ -5,14 +5,17 @@
 @rem # SPDX-License-Identifier: Apache-2.0 OR MIT
 @rem #
 
-@IF "%LY_ANDROID_NDK_ROOT%" == "" (
-    @echo Need to set the varible LY_ANDROID_NDK_ROOT to the location of your NDK install!
-    @exit /b 1
-)
 
-cmake -S temp/src -B temp/build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-fPIC" -DCMAKE_CXX_STANDARD=17 -DCMAKE_TOOLCHAIN_FILE=%LY_ANDROID_NDK_ROOT%\\build\\cmake\\android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DBUILD_SHARED_LIBS=OFF -DSKIP_INSTALL_FILES=YES
+@rem note that toolchain path is relative to the source path (-S) not to the folder this script lives in.
+cmake -S temp/src -B temp/build -G Ninja ^
+    -DCMAKE_BUILD_TYPE=Release ^
+    -DCMAKE_CXX_STANDARD=17 ^
+    -DCMAKE_TOOLCHAIN_FILE=../../../../Scripts/cmake/Platform/Android/Toolchain_android.cmake ^
+    -DBUILD_SHARED_LIBS=OFF ^
+    -DSKIP_INSTALL_FILES=YES
 @if %errorlevel% NEQ 0 ( exit /b 1 )
-cmake --build temp/build --target zlibstatic -j 8
+
+cmake --build temp/build --target zlibstatic --parallel
 @if %errorlevel% NEQ 0 ( exit /b 1 )
 
-exit /b 0
+exit /b 0

package-system/zlib/build_zlib_ios.sh

@@ -6,17 +6,11 @@
 #
 #
 
-# The CMakeLists.txt included with zlib unconditionally makes all the dylibs AND also
-# makes "appplication" executables.  This is not great for making a sdk for ios.
-# this custom script just runs it building the static lib only:
-cmake -S temp/src -B temp/build -G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_CXX_STANDARD=17 -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_C_FLAGS="-fPIC" -DSKIP_INSTALL_FILES=YES
-if [ $? -ne 0 ]; then
-    echo "Error generating build"
-    exit 1
-fi
+# note that toolchain path is relative to the source path (-S) not to the folder this script lives in.
+cmake -S temp/src -B temp/build -G Xcode \
+    -DCMAKE_TOOLCHAIN_FILE=../../../../Scripts/cmake/Platform/iOS/Toolchain_ios.cmake \
+    -DSKIP_INSTALL_FILES=YES || exit 1
+
+cmake --build temp/build --target zlibstatic --config Release --parallel || exit 1
+
 
-cmake --build temp/build --target zlibstatic --config Release -j 8
-if [ $? -ne 0 ]; then
-    echo "Error building"
-    exit 1
-fi

package-system/zlib/build_zlib_linux.sh

@@ -6,14 +6,11 @@
 #
 #
 
-cmake -S temp/src -B temp/build -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DCMAKE_C_FLAGS=-fPIC -DSKIP_INSTALL_FILES=YES
-if [ $? -ne 0 ]; then
-    echo "Error generating build"
-    exit 1
-fi
+cmake -S temp/src -B temp/build \
+     -G Ninja \
+     -DCMAKE_BUILD_TYPE=Release \
+     -DCMAKE_C_FLAGS=-fPIC \
+     -DSKIP_INSTALL_FILES=YES || exit 1
+
+cmake --build temp/build --target zlibstatic --parallel || exit 1
 
-cmake --build temp/build --target zlibstatic -j 8
-if [ $? -ne 0 ]; then
-    echo "Error building"
-    exit 1
-fi

package-system/zlib/build_zlib_mac.sh

@@ -6,15 +6,11 @@
 #
 #
 
-cmake -S temp/src -B temp/build -G Xcode -DCMAKE_CXX_STANDARD=17 -DSKIP_INSTALL_FILES=YES
-if [ $? -ne 0 ]; then
-    echo "Error generating build"
-    exit 1
-fi
+# note that toolchain path is relative to the source path (-S) not to the folder this script lives in.
+cmake -S temp/src -B temp/build -G Xcode \
+    -DSKIP_INSTALL_FILES=YES \
+    -DCMAKE_TOOLCHAIN_FILE=../../../../Scripts/cmake/Platform/Mac/Toolchain_mac.cmake || exit 1
+
+cmake --build temp/build --target zlibstatic --parallel --config Release || exit 1
 
-cmake --build temp/build --target zlibstatic --config Release -j 8
-if [ $? -ne 0 ]; then
-    echo "Error building"
-    exit 1
-fi
 

package-system/zlib/build_zlib_windows.cmd

@@ -5,11 +5,9 @@
 @rem # SPDX-License-Identifier: Apache-2.0 OR MIT
 @rem #
 
-cmake -S temp/src -B temp/build  -DCMAKE_CXX_STANDARD=17 -DCMAKE_DEBUG_POSTFIX=d -DBUILD_SHARED_LIBS=OFF -DSKIP_INSTALL_FILES=YES
+cmake -S temp/src -B temp/build -DBUILD_SHARED_LIBS=OFF -DSKIP_INSTALL_FILES=YES
 @if %errorlevel% NEQ 0 ( exit /b 1 )
-cmake --build temp/build --target zlibstatic --config Release -j 8
-@if %errorlevel% NEQ 0 ( exit /b 1 )
-cmake --build temp/build --target zlibstatic --config Debug -j 8
+cmake --build temp/build --target zlibstatic --config Release --parallel
 @if %errorlevel% NEQ 0 ( exit /b 1 )
 
 exit /b 0

package-system/zlib/install_zlib_android.cmd

@@ -22,7 +22,5 @@ copy %SRC_PATH%\LICENSE %OUT_PATH%\LICENSE
 @if %errorlevel% NEQ 0 ( exit /b 1 )
 copy %BLD_PATH%\libz.a %OUT_PATH%\lib\libz.a
 @if %errorlevel% NEQ 0 ( exit /b 1 )
-copy FindZLIB_compat_unixlike.cmake %OUT_PATH%\FindZLIB.cmake
-@if %errorlevel% NEQ 0 ( exit /b 1 )
 
 exit /b 0

package-system/zlib/install_zlib_ios.sh

@@ -21,6 +21,5 @@ cp -f $SRC_PATH/LICENSE $OUT_PATH/ || exit 1
 cp $BLD_PATH/Release-iphoneos/libz.a $OUT_PATH/lib/libz.a || exit 1
 cp $BLD_PATH/zconf.h $OUT_PATH/include/zconf.h || exit 1
 cp $SRC_PATH/zlib.h $OUT_PATH/include/zlib.h || exit 1
-cp FindZLIB_compat_unixlike.cmake $OUT_PATH/FindZLIB.cmake || exit 1
 
 exit 0

package-system/zlib/install_zlib_linux.sh

@@ -20,6 +20,5 @@ cp -f $SRC_PATH/LICENSE $OUT_PATH/ || exit 1
 cp $BLD_PATH/libz.a $OUT_PATH/lib/libz.a || exit 1
 cp $BLD_PATH/zconf.h $OUT_PATH/include/zconf.h || exit 1
 cp $SRC_PATH/zlib.h $OUT_PATH/include/zlib.h || exit 1
-cp FindZLIB_compat_unixlike.cmake $OUT_PATH/FindZLIB.cmake || exit 1
 
 exit 0

package-system/zlib/install_zlib_mac.sh

@@ -20,6 +20,5 @@ cp -f $SRC_PATH/LICENSE $OUT_PATH/ || exit 1
 cp $BLD_PATH/Release/libz.a $OUT_PATH/lib/libz.a || exit 1
 cp $BLD_PATH/zconf.h $OUT_PATH/include/zconf.h || exit 1
 cp $SRC_PATH/zlib.h $OUT_PATH/include/zlib.h || exit 1
-cp FindZLIB_compat_unixlike.cmake $OUT_PATH/FindZLIB.cmake || exit 1
 
 exit 0

package-system/zlib/install_zlib_windows.cmd

@@ -22,11 +22,5 @@ copy %SRC_PATH%\LICENSE %OUT_PATH%\LICENSE
 @if %errorlevel% NEQ 0 ( exit /b 1 )
 copy %BLD_PATH%\Release\zlibstatic.lib %OUT_PATH%\lib\zlibstatic.lib
 @if %errorlevel% NEQ 0 ( exit /b 1 )
-copy %BLD_PATH%\Debug\zlibstaticd.lib %OUT_PATH%\lib\zlibstaticd.lib
-@if %errorlevel% NEQ 0 ( exit /b 1 )
-copy %BLD_PATH%\Debug\zlibstaticd.pdb %OUT_PATH%\lib\zlibstaticd.pdb
-@if %errorlevel% NEQ 0 ( exit /b 1 )
-copy FindZLIB_compat_windows.cmake %OUT_PATH%\FindZLIB.cmake
-@if %errorlevel% NEQ 0 ( exit /b 1 )
 
 exit /b 0

package_build_list_host_darwin.json

@@ -39,8 +39,8 @@
         "mcpp-2.7.2_az.2-rev1-mac": "package-system/mcpp/get_and_build_mcpp.py mcpp-2.7.2_az.2-rev1",
         "mikkelsen-1.0.0.4-mac": "package-system/mikkelsen/build_package_image.py --platform mac",
         "mikkelsen-1.0.0.4-ios": "package-system/mikkelsen/build_package_image.py --platform ios",
-        "zlib-1.2.11-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Mac --package-root ../../package-system --clean",
-        "zlib-1.2.11-rev2-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name iOS --package-root ../../package-system --clean",
+        "zlib-1.2.11-rev5-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Mac --package-root ../../package-system --clean",
+        "zlib-1.2.11-rev5-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name iOS --package-root ../../package-system --clean",
         "lz4-1.9.3-vcpkg-rev4-mac": "package-system/lz4/build_package_image.py --platform-name mac",
         "lz4-1.9.3-vcpkg-rev4-ios": "package-system/lz4/build_package_image.py --platform-name ios",
         "tiff-4.2.0.15-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Mac --package-root ../../package-system --clean",
@@ -88,8 +88,8 @@
         "SQLite-3.32.2-rev3-multiplatform": "package-system/SQLite-multiplatform",
         "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
         "qt-5.15.2-rev5-mac": "package-system/qt-mac",
-        "zlib-1.2.11-rev2-mac": "package-system/zlib-mac",
-        "zlib-1.2.11-rev2-ios": "package-system/zlib-ios",
+        "zlib-1.2.11-rev5-mac": "package-system/zlib-mac",
+        "zlib-1.2.11-rev5-ios": "package-system/zlib-ios",
         "lz4-1.9.3-vcpkg-rev4-mac": "package-system/lz4-mac",
         "lz4-1.9.3-vcpkg-rev4-ios": "package-system/lz4-ios"
     }

package_build_list_host_linux.json

@@ -29,7 +29,7 @@
         "tiff-4.2.0.15-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Linux --package-root ../../package-system --clean",
         "python-3.7.10-rev2-linux": "package-system/python/build_package_image.py",
         "mikkelsen-1.0.0.4-linux": "package-system/mikkelsen/build_package_image.py",
-        "zlib-1.2.11-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux --package-root ../../package-system --clean",
+        "zlib-1.2.11-rev5-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux --package-root ../../package-system --clean",
         "lz4-1.9.3-vcpkg-rev4-linux": "package-system/lz4/build_package_image.py --platform-name linux"
     },
     "build_from_folder": {
@@ -63,7 +63,7 @@
         "SQLite-3.32.2-rev3-multiplatform": "package-system/SQLite-multiplatform",
         "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
         "qt-5.15.2-rev5-linux": "package-system/qt-linux",
-        "zlib-1.2.11-rev2-linux": "package-system/zlib-linux",
+        "zlib-1.2.11-rev5-linux": "package-system/zlib-linux",
         "lz4-1.9.3-vcpkg-rev4-linux": "package-system/lz4-linux"
     }
 }

package_build_list_host_windows.json

@@ -43,8 +43,8 @@
         "python-3.7.10-rev2-windows": "package-system/python/build_package_image.py",
         "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",
-        "zlib-1.2.11-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Windows --package-root ../../package-system --clean",
-        "zlib-1.2.11-rev2-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Android --package-root ../../package-system --clean",
+        "zlib-1.2.11-rev5-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Windows --package-root ../../package-system --clean",
+        "zlib-1.2.11-rev5-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Android --package-root ../../package-system --clean",
         "lz4-1.9.3-vcpkg-rev4-windows": "package-system/lz4/build_package_image.py --platform-name windows",
         "lz4-1.9.3-vcpkg-rev4-android": "package-system/lz4/build_package_image.py --platform-name android",
         "tiff-4.2.0.15-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Windows --package-root ../../package-system --clean",
@@ -113,8 +113,8 @@
         "ISPCTexComp-36b80aa-rev1-windows": "package-system/ISPCTexComp-windows",
         "qt-5.15.2-rev4-windows": "package-system/qt-windows",
         "Wwise-2021.1.0.7575-rev1-multiplatform": "package-system/Wwise-multiplatform",
-        "zlib-1.2.11-rev2-android": "package-system/zlib-android",
-        "zlib-1.2.11-rev2-windows": "package-system/zlib-windows",
+        "zlib-1.2.11-rev5-android": "package-system/zlib-android",
+        "zlib-1.2.11-rev5-windows": "package-system/zlib-windows",
         "lz4-1.9.3-vcpkg-rev4-windows": "package-system/lz4-windows",
         "lz4-1.9.3-vcpkg-rev4-android": "package-system/lz4-android"
     }