diff --git a/.ci/macos/build.sh b/.ci/macos/build.sh index 37e2d508b..c336ece14 100755 --- a/.ci/macos/build.sh +++ b/.ci/macos/build.sh @@ -4,7 +4,6 @@ set -o pipefail export Qt5_DIR=$(pwd)/Qt-5.15.2-universal -# export PATH="/opt/local/libexec:$PATH" export PATH=$PATH:/opt/local/bin # ccache configurations export CCACHE_CPP2=yes diff --git a/.ci/macos/deps.sh b/.ci/macos/deps.sh index 4be9c6fa3..0f28e2a72 100755 --- a/.ci/macos/deps.sh +++ b/.ci/macos/deps.sh @@ -17,7 +17,6 @@ for i in *.pkg; do sudo installer -pkg $i -target /opt/local; done # sudo cp -rv vulkan/* /opt/local/ sudo cp -rv ffmpeg/* /opt/local/ cd .. -# sudo port install openssl3 +universal glslang +universal moltenvk +universal vulkan-loader +universal libsdl2 +universal # grab qt5 universal2 binaries wget https://github.com/MichaelGDev48/qt5.15.2-universal-binaries/releases/download/1.0/Qt-5.15.2-universal.zip unzip Qt-5.15.2-universal diff --git a/.ci/macos/upload.sh b/.ci/macos/upload.sh index 647f1bb25..7edb2264e 100755 --- a/.ci/macos/upload.sh +++ b/.ci/macos/upload.sh @@ -35,9 +35,6 @@ cp /opt/local/lib/libSDL2-2.0.0.dylib $BUNDLE_FRAMEWORKS_PATH cp /opt/local/lib/libSDL2-2.0.0.dylib $BUNDLE_FRAMEWORKS_PATH/libSDL2-2.0.dylib -# install_name_tool -add_rpath "@loader_path/../lib/" $BUNDLE_EXECUTABLE_PATH -# # one for frameworks as well -# install_name_tool -add_rpath "@loader_path/../Frameworks/" $BUNDLE_EXECUTABLE_PATH