Skip to content

Commit ac2b38c

Browse files
KAHR-AlphaKAHR-Alpha
committed
Update of the zlib and libpng dependencies
1 parent f0da777 commit ac2b38c

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

‎.github/workflows/Ubuntu Dependencies.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ jobs:
8888
path: builds/zlib
8989
key: ${{ runner.os }}-cache-key-zlib
9090

91-
- run: wget https://zlib.net/zlib-1.3.tar.gz
92-
- run: tar -xzf zlib-1.3.tar.gz
91+
- run: wget https://zlib.net/zlib-1.3.1.tar.gz
92+
- run: tar -xzf zlib-1.3.1.tar.gz
9393
- run: |
94-
cd zlib-1.3
94+
cd zlib-1.3.1
9595
cmake -B ${{github.workspace}}/build -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/builds/zlib -DCMAKE_BUILD_TYPE=Release
9696
cd ${{github.workspace}}/build
9797
make
@@ -106,10 +106,10 @@ jobs:
106106
path: builds/libpng
107107
key: ${{ runner.os }}-cache-key-libpng
108108

109-
- run: wget http://prdownloads.sourceforge.net/libpng/libpng-1.6.39.tar.gz
110-
- run: tar -xzf libpng-1.6.39.tar.gz
109+
- run: wget http://prdownloads.sourceforge.net/libpng/libpng-1.6.42.tar.gz
110+
- run: tar -xzf libpng-1.6.42.tar.gz
111111
- run: |
112-
cd libpng-1.6.39
112+
cd libpng-1.6.42
113113
cmake -B ${{github.workspace}}/build/ -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/builds/libpng -DCMAKE_BUILD_TYPE=Release
114114
cd ${{github.workspace}}/build
115115
make

‎.github/workflows/Windows Dependencies.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,17 @@ jobs:
6868
path: builds/zlib
6969
key: ${{ runner.os }}-cache-key-zlib
7070

71-
- run: Invoke-WebRequest -URI https://zlib.net/zlib13.zip -OutFile sources.zip
71+
- run: Invoke-WebRequest -URI https://zlib.net/zlib131.zip -OutFile sources.zip
7272
- run: Expand-Archive ./sources.zip
7373

7474
- run: cmake -B "${{github.workspace}}/cmake_build" -DCMAKE_INSTALL_PREFIX="${{github.workspace}}/builds/zlib" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
75-
working-directory: sources/zlib-1.3
75+
working-directory: sources/zlib-1.3.1
7676

7777
- run: cmake --build "${{github.workspace}}/cmake_build" --config ${{env.BUILD_TYPE}}
78-
working-directory: sources/zlib-1.3
78+
working-directory: sources/zlib-1.3.1
7979

8080
- run: cmake --install "${{github.workspace}}/cmake_build"
81-
working-directory: sources/zlib-1.3
81+
working-directory: sources/zlib-1.3.1
8282

8383
build_libpng:
8484
runs-on: windows-latest
@@ -100,13 +100,13 @@ jobs:
100100
- run: Expand-Archive ./sources.zip
101101

102102
- 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
103-
working-directory: sources/lpng1639
103+
working-directory: sources/lpng1642
104104

105105
- run: cmake --build "${{github.workspace}}/cmake_build" --config ${{env.BUILD_TYPE}}
106-
working-directory: sources/lpng1639
106+
working-directory: sources/lpng1642
107107

108108
- run: cmake --install "${{github.workspace}}/cmake_build"
109-
working-directory: sources/lpng1639
109+
working-directory: sources/lpng1642
110110

111111
build_freetype:
112112
runs-on: windows-latest

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ Aether.cscope_file_list
1010
libs
1111
libs_mingw
1212
libs_vs22
13-
cmake_build
13+
cmake_build*

‎contribs/build_mingw/build_dependencies.ps1‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ cmake --install "cmake_build"
2626
###########
2727

2828
cd ${sources_path}
29-
if(!(Test-Path zlib13.zip))
29+
if(!(Test-Path zlib131.zip))
3030
{
31-
Invoke-WebRequest -URI https://zlib.net/zlib13.zip -OutFile zlib13.zip
32-
Expand-Archive -Force ./zlib13.zip
31+
Invoke-WebRequest -URI https://zlib.net/zlib131.zip -OutFile zlib131.zip
32+
Expand-Archive -Force ./zlib131.zip
3333
}
34-
cd zlib13/zlib-1.3
34+
cd zlib131/zlib-1.3.1
3535
cmake -B "cmake_build" -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX="${build_path}/zlib" -DCMAKE_BUILD_TYPE=Release
3636
cmake --build "cmake_build" --config Release --parallel 8
3737
cmake --install "cmake_build"
@@ -47,7 +47,7 @@ if(!(Test-Path libpng.zip))
4747
Invoke-WebRequest -UserAgent "Wget" -URI https://sourceforge.net/projects/libpng/files/latest/download -OutFile libpng.zip
4848
Expand-Archive -Force ./libpng.zip
4949
}
50-
cd libpng/lpng1639
50+
cd libpng/lpng1642
5151
cmake -B "cmake_build" -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX="${build_path}/libpng" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="../../zlib_build"
5252
cmake --build "cmake_build" --config Release --parallel 8
5353
cmake --install "cmake_build"

‎contribs/build_mingw/set_up_Codeblocks.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ set base_path $pwd
22
set sources_path ${base_path}/libs_mingw/sources
33
set build_path ${base_path}/libs_mingw/builds
44

5-
Remove-Item -Recurse ./cmake_build
6-
cmake -B "cmake_build" -G "CodeBlocks - MinGW Makefiles" `
5+
# Remove-Item -Recurse ./cmake_build
6+
cmake -B "cmake_build_CB" -G "CodeBlocks - MinGW Makefiles" `
77
-DIDE_SETUP=ON `
88
-DTASK="Build CLI+GUI" `
99
-DINSTALL_PATH="${build_path}/Aether" `
@@ -22,8 +22,8 @@ cmake -B "cmake_build" -G "CodeBlocks - MinGW Makefiles" `
2222
-DWXWIDGETS_ADV="${build_path}/wxWidgets/lib/gcc_x64_dll/wxmsw32u_adv_gcc_custom.dll" `
2323
-DWXWIDGETS_GL="${build_path}/wxWidgets/lib/gcc_x64_dll/wxmsw32u_gl_gcc_custom.dll"
2424

25-
$cbp = Get-Content -Path "cmake_build/Aether.cbp" -Raw
25+
$cbp = Get-Content -Path "cmake_build_CB/Aether.cbp" -Raw
2626

2727
$cbp = $cbp.Replace("mingw32-make.exe","mingw32-make.exe -j 8")
2828

29-
Set-Content -Path "cmake_build/Aether.cbp" -Value $cbp
29+
Set-Content -Path "cmake_build_CB/Aether.cbp" -Value $cbp

‎contribs/build_vs2022/build_dependencies.ps1‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ cmake --install "cmake_build"
3535
###########
3636

3737
cd ${sources_path}
38-
if(!(Test-Path zlib13.zip))
38+
if(!(Test-Path zlib131.zip))
3939
{
40-
Invoke-WebRequest -URI https://zlib.net/zlib13.zip -OutFile zlib13.zip
41-
Expand-Archive -Force ./zlib13.zip
40+
Invoke-WebRequest -URI https://zlib.net/zlib131.zip -OutFile zlib131.zip
41+
Expand-Archive -Force ./zlib131.zip
4242
}
43-
cd zlib13/zlib-1.3
43+
cd zlib131/zlib-1.3.1
4444
cmake -B "cmake_build" -G "Visual Studio 17 2022" -DCMAKE_INSTALL_PREFIX="${build_path}/zlib" -DCMAKE_BUILD_TYPE=Release
4545
cmake --build "cmake_build" --config Release --parallel 8
4646
cmake --install "cmake_build"
@@ -56,7 +56,7 @@ if(!(Test-Path libpng.zip))
5656
Invoke-WebRequest -UserAgent "Wget" -URI https://sourceforge.net/projects/libpng/files/latest/download -OutFile libpng.zip
5757
Expand-Archive -Force ./libpng.zip
5858
}
59-
cd libpng/lpng1639
59+
cd libpng/lpng1642
6060
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"
6161
cmake --build "cmake_build" --config Release --parallel 8
6262
cmake --install "cmake_build"

‎contribs/build_vs2022/setup_vs_studio.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set wxWidgets_ROOT_DIR "${build_path}/wxWidgets"
66

77
# Remove-Item -Recurse ./cmake_build
88

9-
cmake -B "cmake_build" -G "Visual Studio 17 2022" `
9+
cmake -B "cmake_build_VS" -G "Visual Studio 17 2022" `
1010
-DIDE_SETUP=ON `
1111
-DTASK="Build CLI+GUI" `
1212
-DINSTALL_PATH="${build_path}/Aether" `

0 commit comments

Comments
 (0)