Skip to content

Commit 739c4e9

Browse files
committed
Angle formulae
(cherry picked from commit 6adba7f)
1 parent 809eb84 commit 739c4e9

File tree

3 files changed

+635
-0
lines changed

3 files changed

+635
-0
lines changed

apothecary/apothecary

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -858,6 +858,7 @@ if [[ "$TYPE" =~ ^(osx|ios|tvos|xros|catos|watchos)$ ]]; then
858858
TVOS_LATEST_SDK=$(xcrun -sdk appletvos --show-sdk-version >/dev/null || echo "SDKNotInstalled")
859859
XROS_MIN_SDK_VER=1.1
860860
WATCHOS_MIN_SDK_VER=6.0
861+
export ARCH_IS_SIMULATOR="false"
861862
fi
862863

863864

@@ -873,10 +874,12 @@ if [ "$TYPE" = "ios" ]; then
873874
export PLATFORM="OS"
874875
elif [ $ARCH == "x86_64" ] || [ $ARCH == 64 ]; then
875876
export PLATFORM="SIMULATOR64"
877+
export ARCH_IS_SIMULATOR="true"
876878
elif [ $ARCH == "arm64" ] ; then
877879
export PLATFORM="OS64"
878880
elif [ $ARCH == "SIM_arm64" ]; then
879881
export PLATFORM="SIMULATORARM64"
882+
export ARCH_IS_SIMULATOR="true"
880883
fi
881884
fi
882885

@@ -890,10 +893,12 @@ if [ "$TYPE" = "tvos" ]; then
890893
export FLAG_RELEASE="-Os -fvisibility=hidden"
891894
if [ $ARCH == "x86_64" ] || [ $ARCH == 64 ]; then
892895
export PLATFORM="SIMULATOR_TVOS"
896+
export ARCH_IS_SIMULATOR="true"
893897
elif [ $ARCH == "arm64" ] ; then
894898
export PLATFORM="TVOS"
895899
elif [ $ARCH == "SIM_arm64" ]; then
896900
export PLATFORM="SIMULATORARM64_TVOS"
901+
export ARCH_IS_SIMULATOR="true"
897902
fi
898903
fi
899904

@@ -903,8 +908,10 @@ if [ "$TYPE" = "watchos" ]; then
903908
export PLATFORM="WATCHOS"
904909
elif [ $ARCH == "x86_64" ] ; then
905910
export PLATFORM="SIMULATOR_WATCHOS"
911+
export ARCH_IS_SIMULATOR="true"
906912
elif [ $ARCH == "SIM_arm64" ]; then
907913
export PLATFORM="SIMULATORARM64_WATCHOS"
914+
export ARCH_IS_SIMULATOR="true"
908915
else
909916
echoError "watchOS incorrect ARCH:[$ARCH]"
910917
fi
@@ -916,8 +923,10 @@ if [ "$TYPE" = "xros" ]; then
916923
export PLATFORM="VISIONOS"
917924
elif [ $ARCH == "x86_64" ] || [ $ARCH == 64 ]; then
918925
export PLATFORM="SIMULATOR64_VISIONOS"
926+
export ARCH_IS_SIMULATOR="true"
919927
elif [ $ARCH == "SIM_arm64" ]; then
920928
export PLATFORM="SIMULATOR_VISIONOS"
929+
export ARCH_IS_SIMULATOR="true"
921930
fi
922931
fi
923932

0 commit comments

Comments
 (0)