diff --git a/3rdParty/zlib/CMakeLists.txt b/3rdParty/zlib/CMakeLists.txt index 767103e49..f310ccb38 100644 --- a/3rdParty/zlib/CMakeLists.txt +++ b/3rdParty/zlib/CMakeLists.txt @@ -2,8 +2,8 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll) include(FetchContent) FetchContent_Declare(zlib - URL https://www.zlib.net/zlib-1.2.11.tar.gz - URL_HASH MD5=1c9f62f0778697a09d36121ead88e08e + URL https://www.zlib.net/zlib-1.2.12.tar.gz + URL_HASH MD5=5fc414a9726be31427b440b434d05f78 ) FetchContent_MakeAvailableExcludeFromAll(zlib) diff --git a/Packaging/amiga/prep.sh b/Packaging/amiga/prep.sh index 011c2db1a..5f8420738 100755 --- a/Packaging/amiga/prep.sh +++ b/Packaging/amiga/prep.sh @@ -30,10 +30,10 @@ mkdir -p ${SYSROOT}/usr/include cd deps # ZLIB -wget https://www.zlib.net/zlib-1.2.11.tar.gz -O zlib-1.2.11.tar.gz -tar -xvf zlib-1.2.11.tar.gz -mkdir -p zlib-1.2.11/build -cd zlib-1.2.11 +wget https://www.zlib.net/zlib-1.2.12.tar.gz -O zlib-1.2.12.tar.gz +tar -xvf zlib-1.2.12.tar.gz +mkdir -p zlib-1.2.12/build +cd zlib-1.2.12 cmake -S. -Bbuild "${CMAKE_FLAGS[@]}" -DM68K_COMMON="${M68K_COMMON} -O3 -fno-exceptions -w -noixemul -DBIG_ENDIAN -DAMIGA -fpermissive -std=c++14" cmake --build build -j"$PARALLELISM" --config Release --target install cd .. diff --git a/docs/building.md b/docs/building.md index 7c43e8dcd..bdac2d24f 100644 --- a/docs/building.md +++ b/docs/building.md @@ -114,7 +114,7 @@ cmake --build build -j $(sysctl -n hw.ncpuonline) ### 32-bit -Download the 32bit MinGW Development Libraries of [SDL2](https://www.libsdl.org/download-2.0.php) and [Libsodium](https://github.com/jedisct1/libsodium/releases) as well as headers for [zlib](https://zlib.net/zlib-1.2.11.tar.gz) and place them in `/usr/i686-w64-mingw32`. This can be done automatically by running `Packaging/windows/mingw-prep.sh`. +Download the 32bit MinGW Development Libraries of [SDL2](https://www.libsdl.org/download-2.0.php) and [Libsodium](https://github.com/jedisct1/libsodium/releases) as well as headers for [zlib](https://zlib.net/zlib-1.2.12.tar.gz) and place them in `/usr/i686-w64-mingw32`. This can be done automatically by running `Packaging/windows/mingw-prep.sh`. ``` sudo apt-get install cmake gcc-mingw-w64-i686 g++-mingw-w64-i686 pkg-config-mingw-w64-i686 libz-mingw-w64-dev @@ -122,7 +122,7 @@ sudo apt-get install cmake gcc-mingw-w64-i686 g++-mingw-w64-i686 pkg-config-ming ### 64-bit -Download the 64bit MinGW Development Libraries of [SDL2](https://www.libsdl.org/download-2.0.php) and [Libsodium](https://github.com/jedisct1/libsodium/releases) as well as headers for [zlib](https://zlib.net/zlib-1.2.11.tar.gz) and place them in `/usr/x86_64-w64-mingw32`. This can be done automatically by running `Packaging/windows/mingw-prep64.sh`. +Download the 64bit MinGW Development Libraries of [SDL2](https://www.libsdl.org/download-2.0.php) and [Libsodium](https://github.com/jedisct1/libsodium/releases) as well as headers for [zlib](https://zlib.net/zlib-1.2.12.tar.gz) and place them in `/usr/x86_64-w64-mingw32`. This can be done automatically by running `Packaging/windows/mingw-prep64.sh`. ``` sudo apt-get install cmake gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 pkg-config-mingw-w64-x86-64 libz-mingw-w64-dev