amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

don't force build debug version of boost on Windows

Browse source
This commit is contained in:
SoftFever 2023-08-10 10:51:44 +08:00
parent c1e85db46e
commit b396f55ddc
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
build_release.bat
View file

@ -3,17 +3,17 @@ cd deps
mkdir build mkdir build
cd build cd build
set DEPS=%CD%/OrcaSlicer_dep set DEPS=%CD%/OrcaSlicer_dep
if "%1"=="studio" ( if "%1"=="slicer" (
GOTO :studio GOTO :slicer
) )
echo "building deps.." echo "building deps.."
cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release
cmake --build . --config Release --target ALL_BUILD -- -m cmake --build . --config Release --target deps -- -m
if "%1"=="deps" exit /b 0 if "%1"=="deps" exit /b 0
:studio :slicer
echo "building studio..." echo "building Orca Slicer..."
cd %WP% cd %WP%
mkdir build mkdir build
cd build cd build

8
build_release_macos.sh
View file

@ -12,7 +12,7 @@ while getopts ":a:sdphn" opt; do
export ARCH="$OPTARG" export ARCH="$OPTARG"
;; ;;
s ) s )
export BUILD_TARGET="studio" export BUILD_TARGET="slicer"
;; ;;
n ) n )
export NIGHTLY_BUILD="1" export NIGHTLY_BUILD="1"
@ -20,7 +20,7 @@ while getopts ":a:sdphn" opt; do
h ) echo "Usage: ./build_release_macos.sh [-d]" h ) echo "Usage: ./build_release_macos.sh [-d]"
echo " -d: Build deps only" echo " -d: Build deps only"
echo " -a: Set ARCHITECTURE (arm64 or x86_64)" echo " -a: Set ARCHITECTURE (arm64 or x86_64)"
echo " -s: Build studio only" echo " -s: Build slicer only"
echo " -n: Nightly build" echo " -n: Nightly build"
exit 0 exit 0
;; ;;
@ -54,7 +54,7 @@ mkdir -p build_$ARCH
cd build_$ARCH cd build_$ARCH
DEPS=$PWD/OrcaSlicer_dep_$ARCH DEPS=$PWD/OrcaSlicer_dep_$ARCH
mkdir -p $DEPS mkdir -p $DEPS
if [ "studio." != $BUILD_TARGET. ]; if [ "slicer." != $BUILD_TARGET. ];
then then
echo "building deps..." echo "building deps..."
echo "cmake ../ -DDESTDIR=$DEPS -DOPENSSL_ARCH=darwin64-${ARCH}-cc -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES:STRING=${ARCH}" echo "cmake ../ -DDESTDIR=$DEPS -DOPENSSL_ARCH=darwin64-${ARCH}-cc -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES:STRING=${ARCH}"
@ -75,7 +75,7 @@ fi
cd $WD cd $WD
mkdir -p build_$ARCH mkdir -p build_$ARCH
cd build_$ARCH cd build_$ARCH
echo "building studio..." echo "building slicer..."
cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="$DEPS/usr/local" -DCMAKE_INSTALL_PREFIX="$PWD/OrcaSlicer" -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/OrcaSlicer" -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 OrcaSlicer mkdir -p OrcaSlicer

10
build_release_vs2022.bat
View file

@ -3,17 +3,17 @@ cd deps
mkdir build mkdir build
cd build cd build
set DEPS=%CD%/OrcaSlicer_dep set DEPS=%CD%/OrcaSlicer_dep
if "%1"=="studio" ( if "%1"=="slicer" (
GOTO :studio GOTO :slicer
) )
echo "building deps.." echo "building deps.."
cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release
cmake --build . --config Release --target ALL_BUILD -- -m cmake --build . --config Release --target deps -- -m
if "%1"=="deps" exit /b 0 if "%1"=="deps" exit /b 0
:studio :slicer
echo "building studio..." echo "building Orca Slicer..."
cd %WP% cd %WP%
mkdir build mkdir build
cd build cd build

2
deps/Boost/Boost.cmake vendored
View file

@ -90,7 +90,7 @@ if (_cfg_rel GREATER -1 OR _cfg_relwdeb GREATER -1 OR _cfg_minsizerel GREATER -1
list(APPEND _boost_variants release) list(APPEND _boost_variants release)
endif() endif()
if (_cfg_deb GREATER -1 OR (MSVC AND ${DEP_DEBUG}) ) if (MSVC AND ${DEP_DEBUG} )
list(APPEND _boost_variants debug) list(APPEND _boost_variants debug)
endif() endif()