Skip to content

Commit 1fefd8d

Browse files
committed
fix
1 parent fe05f8e commit 1fefd8d

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.circleci/config.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
cd ~/deps
147147
curl -L https://download.sourceforge.net/libpng/libpng-1.6.50.tar.xz | tar xz
148148
cd libpng-1.6.50
149-
if [ ! -f /usr/local/lib/libpng16.50.dylib ]; then
149+
if [ ! -f /usr/local/lib/libpng16.16.dylib ]; then
150150
cmake -S. -Bbuild-x86 -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_MACOSX_RPATH=TRUE
151151
cmake --build build-x86 --config release -j$NPROC
152152
fi
@@ -157,17 +157,17 @@ jobs:
157157
mkdir -p ~/deps
158158
cd ~/deps
159159
cd libpng-1.6.50
160-
if [ ! -f /usr/local/lib/libpng16.50.dylib ]; then
160+
if [ ! -f /usr/local/lib/libpng16.16.dylib ]; then
161161
cmake -S. -Bbuild-arm64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_MACOSX_RPATH=TRUE
162162
cmake --build build-arm64 --config release -j$NPROC
163163
fi
164164
165165
- run:
166166
name: Install libpng (Universal)
167167
command: |
168-
if [ ! -f /usr/local/lib/libpng16.50.dylib ]; then
169-
cd ~/deps/libpng-1.6.39/build-arm64
170-
for i in libpng16.50.dylib libpng16.a png-fix-itxt pngfix pngimage pngstest pngtest pngunknown pngvalid
168+
if [ ! -f /usr/local/lib/libpng16.16.dylib ]; then
169+
cd ~/deps/libpng-1.6.50/build-arm64
170+
for i in libpng16.16.39.0.dylib libpng16.a png-fix-itxt pngfix pngimage pngstest pngtest pngunknown pngvalid
171171
do
172172
lipo -create -output $i ../build-x86/$i $i
173173
done
@@ -240,7 +240,7 @@ jobs:
240240
- /usr/local/lib/libhl.1.13.0.dylib
241241
- /usr/local/lib/libogg.0.8.5.dylib
242242
- /usr/local/lib/libopenal.1.22.2.dylib
243-
- /usr/local/lib/libpng16.50.dylib
243+
- /usr/local/lib/libpng16.16.dylib
244244
- /usr/local/lib/libturbojpeg.0.2.0.dylib
245245
- /usr/local/lib/libvorbis.0.4.9.dylib
246246
- /usr/local/lib/libvorbisfile.3.3.8.dylib
@@ -274,7 +274,7 @@ jobs:
274274
cp /usr/local/lib/libhl.1.13.0.dylib libhl.1.dylib
275275
cp /usr/local/lib/libogg.0.8.5.dylib libogg.0.dylib
276276
cp /usr/local/lib/libopenal.1.22.2.dylib libopenal.1.dylib
277-
cp /usr/local/lib/libpng16.50.dylib libpng16.50.dylib
277+
cp /usr/local/lib/libpng16.16.dylib libpng16.16.dylib
278278
cp /usr/local/lib/libturbojpeg.0.2.0.dylib libturbojpeg.0.dylib
279279
cp /usr/local/lib/libvorbis.0.4.9.dylib libvorbis.0.4.9.dylib
280280
cp /usr/local/lib/libvorbisfile.3.3.8.dylib libvorbisfile.3.3.8.dylib
@@ -283,7 +283,7 @@ jobs:
283283
cp /usr/local/lib/libuv.1.dylib libuv.1.dylib
284284
# These libraries have dangling RPATHs
285285
install_name_tool -delete_rpath /usr/local/lib libturbojpeg.0.dylib
286-
for i in fmt.hdll libpng16.50.dylib
286+
for i in fmt.hdll libpng16.16.dylib
287287
do
288288
install_name_tool -change /usr/lib/libz.1.dylib @rpath/libz.1.dylib $i
289289
done

0 commit comments

Comments
 (0)