arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add armv8 and aarch64 options in addition to arm64

pull/363/head
Jeffrey Walton 2017-01-13 05:39:04 -05:00
parent fc306b6474
commit 52f13eca9b
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
TestScripts/setenv-ios.sh
View File

@ -11,7 +11,7 @@
# See http://www.cryptopp.com/wiki/iOS_(Command_Line) for more details # See http://www.cryptopp.com/wiki/iOS_(Command_Line) for more details
# ==================================================================== # ====================================================================
set -eu # set -eu
######################################### #########################################
##### Clear old options ##### ##### Clear old options #####
@ -78,22 +78,22 @@ do
fi fi
# ARM64 # ARM64
if [ "$CL" == "arm64" ]; then if [[ ("$CL" == "arm64" || "$CL" == "armv8" || "$CL" == "aarch64") ]]; then
IOS_ARCH=arm64 IOS_ARCH=arm64
fi fi
# iPhone # iPhone
if [ "$CL" == "iphone" ] || [ "$CL" == "iphoneos" ]; then if [[ ("$CL" == "iphone" || "$CL" == "iphoneos") ]]; then
APPLE_SDK=iPhoneOS APPLE_SDK=iPhoneOS
fi fi
# iPhone Simulator # iPhone Simulator
if [ "$CL" == "simulator" ] || [ "$CL" == "iphonesimulator" ]; then if [[ ("$CL" == "simulator" || "$CL" == "iphonesimulator") ]]; then
APPLE_SDK=iPhoneSimulator APPLE_SDK=iPhoneSimulator
fi fi
# Watch # Watch
if [ "$CL" == "watch" ] || [ "$CL" == "watchos" ] || [ "$CL" == "applewatch" ]; then if [[ ("$CL" == "watch" || "$CL" == "watchos" || "$CL" == "applewatch") ]]; then
APPLE_SDK=WatchOS APPLE_SDK=WatchOS
fi fi
@ -103,12 +103,12 @@ do
fi fi
# Apple TV # Apple TV
if [ "$CL" == "tv" ] || [ "$CL" == "appletv" ] || [ "$CL" == "appletvos" ]; then if [[ ("$CL" == "tv" || "$CL" == "appletv" || "$CL" == "appletvos") ]]; then
APPLE_SDK=AppleTVOS APPLE_SDK=AppleTVOS
fi fi
# Apple TV Simulator # Apple TV Simulator
if [ "$CL" == "tvsimulator" ] || [ "$CL" == "appletvsimulator" ]; then if [[ ("$CL" == "tvsimulator" || "$CL" == "appletvsimulator") ]]; then
APPLE_SDK=AppleTVSimulator APPLE_SDK=AppleTVSimulator
fi fi
@ -213,7 +213,7 @@ if [ "$IOS_ARCH" == "x86_64" ]; then
IOS_FLAGS=-miphoneos-version-min=8 IOS_FLAGS=-miphoneos-version-min=8
fi fi
# Simulator uses i386 or x86_64, Device uses ARMv5, ARMv6, ARMv7, or ARMv7s # Simulator uses i386 or x86_64, Device uses ARMv5, ARMv6, ARMv7, ARMv7s or ARMv8
# #
# Apple deprecated ARMv5 at iOS 4.0, and ARMv6 at iOS 5.0 # Apple deprecated ARMv5 at iOS 4.0, and ARMv6 at iOS 5.0
# http://stackoverflow.com/questions/7488657/how-to-build-for-armv6-and-armv7-architectures-with-ios-5 # http://stackoverflow.com/questions/7488657/how-to-build-for-armv6-and-armv7-architectures-with-ios-5
@ -285,8 +285,9 @@ fi
echo echo
echo "*******************************************************************************" echo "*******************************************************************************"
echo "It looks the the environment is set correctly. Your next step is" echo "It looks the the environment is set correctly. Your next step is build"
echo "build the library with 'make -f GNUmakefile-cross'" echo "the library with 'make -f GNUmakefile-cross'. You can create a versioned"
echo "shared object using 'HAS_SOLIB_VERSION=1 make -f GNUmakefile-cross'"
echo "*******************************************************************************" echo "*******************************************************************************"
echo echo

14
setenv-ios.sh
View File

@ -78,22 +78,22 @@ do
fi fi
# ARM64 # ARM64
if [ "$CL" == "arm64" ]; then if [[ ("$CL" == "arm64" || "$CL" == "armv8" || "$CL" == "aarch64") ]]; then
IOS_ARCH=arm64 IOS_ARCH=arm64
fi fi
# iPhone # iPhone
if [ "$CL" == "iphone" ] || [ "$CL" == "iphoneos" ]; then if [[ ("$CL" == "iphone" || "$CL" == "iphoneos") ]]; then
APPLE_SDK=iPhoneOS APPLE_SDK=iPhoneOS
fi fi
# iPhone Simulator # iPhone Simulator
if [ "$CL" == "simulator" ] || [ "$CL" == "iphonesimulator" ]; then if [[ ("$CL" == "simulator" || "$CL" == "iphonesimulator") ]]; then
APPLE_SDK=iPhoneSimulator APPLE_SDK=iPhoneSimulator
fi fi
# Watch # Watch
if [ "$CL" == "watch" ] || [ "$CL" == "watchos" ] || [ "$CL" == "applewatch" ]; then if [[ ("$CL" == "watch" || "$CL" == "watchos" || "$CL" == "applewatch") ]]; then
APPLE_SDK=WatchOS APPLE_SDK=WatchOS
fi fi
@ -103,12 +103,12 @@ do
fi fi
# Apple TV # Apple TV
if [ "$CL" == "tv" ] || [ "$CL" == "appletv" ] || [ "$CL" == "appletvos" ]; then if [[ ("$CL" == "tv" || "$CL" == "appletv" || "$CL" == "appletvos") ]]; then
APPLE_SDK=AppleTVOS APPLE_SDK=AppleTVOS
fi fi
# Apple TV Simulator # Apple TV Simulator
if [ "$CL" == "tvsimulator" ] || [ "$CL" == "appletvsimulator" ]; then if [[ ("$CL" == "tvsimulator" || "$CL" == "appletvsimulator") ]]; then
APPLE_SDK=AppleTVSimulator APPLE_SDK=AppleTVSimulator
fi fi
@ -213,7 +213,7 @@ if [ "$IOS_ARCH" == "x86_64" ]; then
IOS_FLAGS=-miphoneos-version-min=8 IOS_FLAGS=-miphoneos-version-min=8
fi fi
# Simulator uses i386 or x86_64, Device uses ARMv5, ARMv6, ARMv7, or ARMv7s # Simulator uses i386 or x86_64, Device uses ARMv5, ARMv6, ARMv7, ARMv7s or ARMv8
# #
# Apple deprecated ARMv5 at iOS 4.0, and ARMv6 at iOS 5.0 # Apple deprecated ARMv5 at iOS 4.0, and ARMv6 at iOS 5.0
# http://stackoverflow.com/questions/7488657/how-to-build-for-armv6-and-armv7-architectures-with-ios-5 # http://stackoverflow.com/questions/7488657/how-to-build-for-armv6-and-armv7-architectures-with-ios-5