GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-06-04 11:25:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

minor changes

Browse Source
This commit is contained in:
SoftFever 2023-03-10 18:35:57 +08:00
parent 49d42c52b9
commit c5abc98f11
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build_release_macos.sh
View File

@ -47,9 +47,9 @@ fi
WD="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" WD="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
cd $WD/deps cd $WD/deps
mkdir -p build mkdir -p build_$ARCH
cd build cd build_$ARCH
DEPS=$PWD/BambuStudio_dep DEPS=$PWD/BambuStudio_dep_$ARCH
mkdir -p $DEPS mkdir -p $DEPS
if [ "studio." != $BUILD_TARGET. ]; if [ "studio." != $BUILD_TARGET. ];
then then
@ -66,13 +66,13 @@ then
fi fi
cd $WD cd $WD
mkdir -p build mkdir -p build_$ARCH
cd build cd build_$ARCH
echo "building studio..." echo "building studio..."
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 -DCMAKE_OSX_ARCHITECTURES=${ARCH} cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="$DEPS/usr/local" -DCMAKE_INSTALL_PREFIX="$PWD/BambuStudio-SoftFever_$ARCH" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="$DEPS/usr/local" -DCMAKE_MACOSX_BUNDLE=ON -DCMAKE_OSX_ARCHITECTURES=${ARCH}
cmake --build . --config Release --target ALL_BUILD cmake --build . --config Release --target ALL_BUILD
mkdir -p BambuStudio-SoftFever mkdir -p BambuStudio-SoftFever_$ARCH
cd BambuStudio-SoftFever cd BambuStudio-SoftFever_$ARCH
rm -r ./BambuStudio-SoftFever.app rm -r ./BambuStudio-SoftFever.app
cp -pR ../src/Release/BambuStudio.app ./BambuStudio-SoftFever.app cp -pR ../src/Release/BambuStudio.app ./BambuStudio-SoftFever.app
resources_path=$(readlink ./BambuStudio-SoftFever.app/Contents/Resources) resources_path=$(readlink ./BambuStudio-SoftFever.app/Contents/Resources)
@ -91,4 +91,3 @@ fi
zip -FSr BambuStudio-SoftFever${ver}_Mac_${ARCH}.zip BambuStudio-SoftFever.app zip -FSr BambuStudio-SoftFever${ver}_Mac_${ARCH}.zip BambuStudio-SoftFever.app

3
deps/Boost/Boost.cmake vendored
View File

@ -28,6 +28,9 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
elseif (MSVC_VERSION LESS 1930) elseif (MSVC_VERSION LESS 1930)
# 1920-1929 = VS 16.0 (v142 toolset) # 1920-1929 = VS 16.0 (v142 toolset)
set(_boost_toolset "msvc-14.2") set(_boost_toolset "msvc-14.2")
elseif (MSVC_VERSION LESS 1940)
# 1930-1939 = VS 17.0 (v143 toolset)
set(_boost_toolset "msvc-14.3")
else () else ()
message(FATAL_ERROR "Unsupported MSVC version") message(FATAL_ERROR "Unsupported MSVC version")
endif () endif ()