diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh index c087380f23..eb8212d796 100755 --- a/.ci/build-mac.sh +++ b/.ci/build-mac.sh @@ -1,10 +1,12 @@ #!/bin/sh -ex -brew install -f --overwrite llvm@16 nasm ninja git p7zip create-dmg ccache +brew install -f --overwrite nasm ninja git p7zip create-dmg ccache pipenv #/usr/sbin/softwareupdate --install-rosetta --agree-to-license arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" +arch -x86_64 /usr/local/homebrew/bin/brew update arch -x86_64 /usr/local/homebrew/bin/brew install -f --overwrite llvm@16 sdl2 glew cmake +arch -x86_64 /usr/local/homebrew/bin/brew link -f llvm@16 #export MACOSX_DEPLOYMENT_TARGET=12.0 export CXX=clang++ @@ -21,19 +23,18 @@ export CMAKE_EXTRA_OPTS='-DLLVM_TARGETS_TO_BUILD=X86' export WORKDIR; WORKDIR="$(pwd)" -#get Qt +# Get Qt git clone https://github.com/engnr/qt-downloader.git cd qt-downloader git checkout f52efee0f18668c6d6de2dec0234b8c4bc54c597 -pip3 install pipenv -pipenv run pip3 install py7zr requests semantic_version lxml -pipenv run ./qt-downloader macos desktop 5.15.2 clang_64 --opensource +"/opt/homebrew/bin/pipenv" run pip3 install py7zr requests semantic_version lxml +"/opt/homebrew/bin/pipenv" run ./qt-downloader macos desktop 5.15.2 clang_64 --opensource cd .. export Qt5_DIR="$WORKDIR/qt-downloader/5.15.2/clang_64/lib/cmake/Qt5" export SDL2_DIR="$BREW_X64_PATH/opt/sdl2/lib/cmake/SDL2" -export PATH="$BREW_PATH/opt/llvm@16/bin:$WORKDIR/qt-downloader/5.15.2/clang_64/bin:$BREW_BIN:$BREW_SBIN:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin:$PATH" +export PATH="$BREW_X64_PATH/opt/llvm@16/bin:$WORKDIR/qt-downloader/5.15.2/clang_64/bin:$BREW_BIN:$BREW_SBIN:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin:$PATH" export LDFLAGS="-L$BREW_X64_PATH/lib -Wl,-rpath,$BREW_X64_PATH/lib" export CPPFLAGS="-I$BREW_X64_PATH/include -msse -msse2 -mcx16 -no-pie" export LIBRARY_PATH="$BREW_X64_PATH/lib"