Update of the zlib and libpng dependencies

KAHR-Alpha · Feb 13, 2024 · ac2b38c · ac2b38c
1 parent f0da777
commit ac2b38c
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 29 deletions.
diff --git a/.github/workflows/Ubuntu Dependencies.yml b/.github/workflows/Ubuntu Dependencies.yml
@@ -88,10 +88,10 @@ jobs:
           path: builds/zlib
           key: ${{ runner.os }}-cache-key-zlib
 
-      - run: wget https://zlib.net/zlib-1.3.tar.gz
-      - run: tar -xzf zlib-1.3.tar.gz
+      - run: wget https://zlib.net/zlib-1.3.1.tar.gz
+      - run: tar -xzf zlib-1.3.1.tar.gz
       - run: |
-          cd zlib-1.3
+          cd zlib-1.3.1
           cmake -B ${{github.workspace}}/build -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/builds/zlib -DCMAKE_BUILD_TYPE=Release
           cd ${{github.workspace}}/build
           make
@@ -106,10 +106,10 @@ jobs:
           path: builds/libpng
           key: ${{ runner.os }}-cache-key-libpng
 
-      - run: wget http://prdownloads.sourceforge.net/libpng/libpng-1.6.39.tar.gz
-      - run: tar -xzf libpng-1.6.39.tar.gz
+      - run: wget http://prdownloads.sourceforge.net/libpng/libpng-1.6.42.tar.gz
+      - run: tar -xzf libpng-1.6.42.tar.gz
       - run: |
-          cd libpng-1.6.39
+          cd libpng-1.6.42
           cmake -B ${{github.workspace}}/build/ -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/builds/libpng -DCMAKE_BUILD_TYPE=Release
           cd ${{github.workspace}}/build
           make

diff --git a/.github/workflows/Windows Dependencies.yml b/.github/workflows/Windows Dependencies.yml
@@ -68,17 +68,17 @@ jobs:
           path: builds/zlib
           key: ${{ runner.os }}-cache-key-zlib
 
-      - run: Invoke-WebRequest -URI https://zlib.net/zlib13.zip -OutFile sources.zip
+      - run: Invoke-WebRequest -URI https://zlib.net/zlib131.zip -OutFile sources.zip
       - run: Expand-Archive ./sources.zip
 
       - run: cmake -B "${{github.workspace}}/cmake_build" -DCMAKE_INSTALL_PREFIX="${{github.workspace}}/builds/zlib" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-        working-directory: sources/zlib-1.3
+        working-directory: sources/zlib-1.3.1
 
       - run: cmake --build "${{github.workspace}}/cmake_build" --config ${{env.BUILD_TYPE}}
-        working-directory: sources/zlib-1.3
+        working-directory: sources/zlib-1.3.1
 
       - run: cmake --install "${{github.workspace}}/cmake_build"
-        working-directory: sources/zlib-1.3
+        working-directory: sources/zlib-1.3.1
 
   build_libpng:
     runs-on: windows-latest
@@ -100,13 +100,13 @@ jobs:
       - run: Expand-Archive ./sources.zip
 
       - run: cmake -B "${{github.workspace}}/cmake_build" -DCMAKE_INSTALL_PREFIX="${{github.workspace}}/builds/libpng" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_PREFIX_PATH="${{github.workspace}}/builds/zlib" -DPNG_SHARED=OFF -DPNG_STATIC=ON
-        working-directory: sources/lpng1639
+        working-directory: sources/lpng1642
 
       - run: cmake --build "${{github.workspace}}/cmake_build" --config ${{env.BUILD_TYPE}}
-        working-directory: sources/lpng1639
+        working-directory: sources/lpng1642
 
       - run: cmake --install "${{github.workspace}}/cmake_build"
-        working-directory: sources/lpng1639
+        working-directory: sources/lpng1642
 
   build_freetype:
     runs-on: windows-latest

diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,4 @@ Aether.cscope_file_list
 libs
 libs_mingw
 libs_vs22
-cmake_build
+cmake_build*
diff --git a/contribs/build_mingw/build_dependencies.ps1 b/contribs/build_mingw/build_dependencies.ps1
@@ -26,12 +26,12 @@ cmake --install "cmake_build"
 ###########
 
 cd ${sources_path}
-if(!(Test-Path zlib13.zip))
+if(!(Test-Path zlib131.zip))
 {
-	Invoke-WebRequest -URI https://zlib.net/zlib13.zip -OutFile zlib13.zip
-	Expand-Archive -Force ./zlib13.zip
+	Invoke-WebRequest -URI https://zlib.net/zlib131.zip -OutFile zlib131.zip
+	Expand-Archive -Force ./zlib131.zip
 }
-cd zlib13/zlib-1.3
+cd zlib131/zlib-1.3.1
 cmake -B "cmake_build" -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX="${build_path}/zlib" -DCMAKE_BUILD_TYPE=Release
 cmake --build "cmake_build" --config Release --parallel 8
 cmake --install "cmake_build"
@@ -47,7 +47,7 @@ if(!(Test-Path libpng.zip))
 	Invoke-WebRequest -UserAgent "Wget" -URI https://sourceforge.net/projects/libpng/files/latest/download -OutFile libpng.zip
 	Expand-Archive -Force ./libpng.zip
 }
-cd libpng/lpng1639
+cd libpng/lpng1642
 cmake -B "cmake_build" -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX="${build_path}/libpng" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="../../zlib_build"
 cmake --build "cmake_build" --config Release --parallel 8
 cmake --install "cmake_build"

diff --git a/contribs/build_mingw/set_up_Codeblocks.ps1 b/contribs/build_mingw/set_up_Codeblocks.ps1
@@ -2,8 +2,8 @@ set base_path $pwd
 set sources_path ${base_path}/libs_mingw/sources
 set build_path ${base_path}/libs_mingw/builds
 
-Remove-Item -Recurse ./cmake_build
-cmake -B "cmake_build" -G "CodeBlocks - MinGW Makefiles" `
+# Remove-Item -Recurse ./cmake_build
+cmake -B "cmake_build_CB" -G "CodeBlocks - MinGW Makefiles" `
 	-DIDE_SETUP=ON `
 	-DTASK="Build CLI+GUI" `
 	-DINSTALL_PATH="${build_path}/Aether" `
@@ -22,8 +22,8 @@ cmake -B "cmake_build" -G "CodeBlocks - MinGW Makefiles" `
 	-DWXWIDGETS_ADV="${build_path}/wxWidgets/lib/gcc_x64_dll/wxmsw32u_adv_gcc_custom.dll" `
 	-DWXWIDGETS_GL="${build_path}/wxWidgets/lib/gcc_x64_dll/wxmsw32u_gl_gcc_custom.dll"
 
-$cbp = Get-Content -Path "cmake_build/Aether.cbp" -Raw
+$cbp = Get-Content -Path "cmake_build_CB/Aether.cbp" -Raw
 
 $cbp = $cbp.Replace("mingw32-make.exe","mingw32-make.exe -j 8")
 
-Set-Content -Path "cmake_build/Aether.cbp" -Value $cbp
+Set-Content -Path "cmake_build_CB/Aether.cbp" -Value $cbp
diff --git a/contribs/build_vs2022/build_dependencies.ps1 b/contribs/build_vs2022/build_dependencies.ps1
@@ -35,12 +35,12 @@ cmake --install "cmake_build"
 ###########
 
 cd ${sources_path}
-if(!(Test-Path zlib13.zip))
+if(!(Test-Path zlib131.zip))
 {
-	Invoke-WebRequest -URI https://zlib.net/zlib13.zip -OutFile zlib13.zip
-	Expand-Archive -Force ./zlib13.zip
+	Invoke-WebRequest -URI https://zlib.net/zlib131.zip -OutFile zlib131.zip
+	Expand-Archive -Force ./zlib131.zip
 }
-cd zlib13/zlib-1.3
+cd zlib131/zlib-1.3.1
 cmake -B "cmake_build" -G "Visual Studio 17 2022" -DCMAKE_INSTALL_PREFIX="${build_path}/zlib" -DCMAKE_BUILD_TYPE=Release
 cmake --build "cmake_build" --config Release --parallel 8
 cmake --install "cmake_build"
@@ -56,7 +56,7 @@ if(!(Test-Path libpng.zip))
 	Invoke-WebRequest -UserAgent "Wget" -URI https://sourceforge.net/projects/libpng/files/latest/download -OutFile libpng.zip
 	Expand-Archive -Force ./libpng.zip
 }
-cd libpng/lpng1639
+cd libpng/lpng1642
 cmake -B "cmake_build" -G "Visual Studio 17 2022" -DCMAKE_INSTALL_PREFIX="${build_path}/libpng" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="${build_path}/zlib"
 cmake --build "cmake_build" --config Release --parallel 8
 cmake --install "cmake_build"

diff --git a/contribs/build_vs2022/setup_vs_studio.ps1 b/contribs/build_vs2022/setup_vs_studio.ps1
@@ -6,7 +6,7 @@ set wxWidgets_ROOT_DIR "${build_path}/wxWidgets"
 
 # Remove-Item -Recurse ./cmake_build
 
-cmake -B "cmake_build" -G "Visual Studio 17 2022" `
+cmake -B "cmake_build_VS" -G "Visual Studio 17 2022" `
 	-DIDE_SETUP=ON `
 	-DTASK="Build CLI+GUI" `
 	-DINSTALL_PATH="${build_path}/Aether" `