diff --git a/build_release_macos.sh b/build_release_macos.sh index d4c9bb7ffb2..93028fc9fd7 100755 --- a/build_release_macos.sh +++ b/build_release_macos.sh @@ -1,5 +1,4 @@ #!/bin/sh - WD="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" cd $WD/deps mkdir -p build @@ -7,14 +6,22 @@ cd build DEPS=$PWD/BambuStudio_dep mkdir -p $DEPS cmake ../ -DDESTDIR="$DEPS" -DOPENSSL_ARCH="darwin64-$(uname -m)-cc" -DCMAKE_BUILD_TYPE=Release -cmake --build . --config Release --target ALL_BUILD +cmake --build . --config Release --target all cd $WD mkdir -p build cd build cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="$DEPS/usr/local" -DCMAKE_INSTALL_PREFIX="$PWD/BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="$DEPS/usr/local" -DCMAKE_MACOSX_BUNDLE=ON cmake --build . --config Release --target ALL_BUILD -# cmake --build . --target install --config Release -# cd BambuStudio-SoftFever -# cp -r bin/BambuStudio.app/Contents/MacOS BambuStudio.app/Contents -# cp -r bin/BambuStudio.app/Contents/Info.plist BambuStudio.app/Contents/ +mkdir -p BambuStudio-SoftFever +cd BambuStudio-SoftFever +rm -r ./BambuStudio-SoftFever.app +cp -pR ../src/Release/BambuStudio.app ./BambuStudio-SoftFever.app +resources_path=$(readlink ./BambuStudio-SoftFever.app/Contents/Resources) +rm ./BambuStudio-SoftFever.app/Contents/Resources +cp -R $resources_path ./BambuStudio-SoftFever.app/Contents/Resources +# extract version +ver=$(grep '^#define SoftFever_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3) +ver="${ver//\"}" +zip -FSr BambuStudio-SoftFever_V${ver}_Mac_$(uname -m).zip BambuStudio-SoftFever.app + diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 4d762a524a8..ad4bafa5cf3 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -117,7 +117,7 @@ if (MSVC) endif () elseif (APPLE) message("OS X SDK Path: ${CMAKE_OSX_SYSROOT}") - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE) + set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE) if (CMAKE_OSX_DEPLOYMENT_TARGET) set(DEP_OSX_TARGET "${CMAKE_OSX_DEPLOYMENT_TARGET}") message("OS X Deployment Target: ${DEP_OSX_TARGET}")