Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-09-17 08:02:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CI: Use OS zlib for MacOS

Browse source 
Because the updater doesn't get fixup'd, so the dylib doesn't get added
to its bundle.
This commit is contained in:
Stenzek 2024-03-26 00:45:04 +10:00
parent 3e8dd2c374
commit 98d2d866d6
No known key found for this signature in database
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeModules/DuckStationDependencies.cmake
View file

@ -11,7 +11,7 @@ if(NOT WIN32 AND NOT ANDROID)
find_package(Zstd 1.5.5 REQUIRED) find_package(Zstd 1.5.5 REQUIRED)
find_package(WebP REQUIRED) # v1.3.2, spews an error on Linux because no pkg-config. find_package(WebP REQUIRED) # v1.3.2, spews an error on Linux because no pkg-config.
find_package(ZLIB 1.3 REQUIRED) find_package(ZLIB REQUIRED) # 1.3, but Mac currently doesn't use it.
find_package(PNG 1.6.40 REQUIRED) find_package(PNG 1.6.40 REQUIRED)
find_package(JPEG REQUIRED) # No version because flatpak uses libjpeg-turbo. find_package(JPEG REQUIRED) # No version because flatpak uses libjpeg-turbo.
find_package(CURL REQUIRED) find_package(CURL REQUIRED)

17
scripts/build-dependencies-mac.sh
View file

@ -99,14 +99,15 @@ make -C build "-j$NPROCS"
make -C build install make -C build install
cd .. cd ..
echo "Installing Zlib..." # Temporarily disabled, because the updater doesn't get fixup'd, so the dylib doesn't get added to its bundle.
rm -fr "zlib-$ZLIB" #echo "Installing Zlib..."
tar xf "zlib-$ZLIB.tar.gz" #rm -fr "zlib-$ZLIB"
cd "zlib-$ZLIB" #tar xf "zlib-$ZLIB.tar.gz"
cmake -B build "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DZLIB_BUILD_EXAMPLES=OFF #cd "zlib-$ZLIB"
make -C build "-j$NPROCS" #cmake -B build "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DZLIB_BUILD_EXAMPLES=OFF
make -C build install #make -C build "-j$NPROCS"
cd .. #make -C build install
#cd ..
echo "Installing Zstd..." echo "Installing Zstd..."
rm -fr "zstd-$ZSTD" rm -fr "zstd-$ZSTD"