Merge pull request #33 from KAHR-Alpha/ubuntu_fftw_fix

libpng update
KAHR-Alpha · Feb 23, 2024 · 2312c2b · 2312c2b
2 parents db91bc7 + f592032
commit 2312c2b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/Windows Dependencies.yml b/.github/workflows/Windows Dependencies.yml
@@ -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/lpng1642
+        working-directory: sources/lpng1643
 
       - run: cmake --build "${{github.workspace}}/cmake_build" --config ${{env.BUILD_TYPE}}
-        working-directory: sources/lpng1642
+        working-directory: sources/lpng1643
 
       - run: cmake --install "${{github.workspace}}/cmake_build"
-        working-directory: sources/lpng1642
+        working-directory: sources/lpng1643
 
   build_freetype:
     runs-on: windows-latest

diff --git a/contribs/build_mingw/build_dependencies.ps1 b/contribs/build_mingw/build_dependencies.ps1
@@ -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/lpng1642
+cd libpng/lpng1643
 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_vs2022/build_dependencies.ps1 b/contribs/build_vs2022/build_dependencies.ps1
@@ -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/lpng1642
+cd libpng/lpng1643
 cmake -B "cmake_build" -G "Visual Studio 17 2022" -DCMAKE_INSTALL_PREFIX="${build_path}/libpng" -DCMAKE_PREFIX_PATH="${build_path}/zlib"
 cmake --build "cmake_build" --config Release --parallel 8
 cmake --install "cmake_build" --config Release

diff --git a/contribs/build_vs2022/build_dependencies_debug.ps1 b/contribs/build_vs2022/build_dependencies_debug.ps1
@@ -55,7 +55,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/lpng1642
+cd libpng/lpng1643
 cmake -B "cmake_build" -G "Visual Studio 17 2022" -DCMAKE_INSTALL_PREFIX="${build_path}/libpng" -DCMAKE_PREFIX_PATH="${build_path}/zlib"
 cmake --build "cmake_build" --config Debug --parallel 8
 cmake --install "cmake_build" --config Debug