Update build for monero and haven
M committed
Mar 31, 2022 at 21:45 UTC
8256664231ddc3078d24ea8c024f676c619f9c3a
5 files changed
+29
-21
cw_haven/android/CMakeLists.txt
+1
-1
@@ -6,7 +6,7 @@ add_library( cw_haven
6
7
find_library( log-lib log )
8
9
-set(EXTERNAL_LIBS_DIR ${CMAKE_SOURCE_DIR}/../ios/External/android)
9
+set(EXTERNAL_LIBS_DIR ${CMAKE_SOURCE_DIR}/../../cw_shared_external/ios/External/android)
10
11
############
12
# libsodium
cw_monero/android/CMakeLists.txt
+1
-1
@@ -7,7 +7,7 @@ add_library( cw_monero
7
8
find_library( log-lib log )
9
10
-set(EXTERNAL_LIBS_DIR ${CMAKE_SOURCE_DIR}/../ios/External/android)
10
+set(EXTERNAL_LIBS_DIR ${CMAKE_SOURCE_DIR}/../../cw_shared_external/ios/External/android)
11
12
############
13
# libsodium
scripts/ios/build_haven.sh
+6
-4
@@ -7,6 +7,8 @@ HAVEN_DIR_PATH="${EXTERNAL_IOS_SOURCE_DIR}/haven"
7
HAVEN_VERSION=tags/v2.2.2
8
BUILD_TYPE=release
9
PREFIX=${EXTERNAL_IOS_DIR}
10
+DEST_LIB_DIR=${EXTERNAL_IOS_LIB_DIR}/haven
11
+DEST_INCLUDE_DIR=${EXTERNAL_IOS_INCLUDE_DIR}/haven
12
13
echo "Cloning haven from - $HAVEN_URL to - $HAVEN_DIR_PATH"
14
git clone $HAVEN_URL $HAVEN_DIR_PATH
@@ -55,8 +57,8 @@ popd
57
58
done
59
58
-mkdir -p $EXTERNAL_IOS_LIB_DIR/haven
59
-mkdir -p $EXTERNAL_IOS_INCLUDE_DIR/haven
60
#only for arm64
61
-cp ${HAVEN_DIR_PATH}/lib-armv8-a/* $EXTERNAL_IOS_LIB_DIR/haven
62
-cp ${HAVEN_DIR_PATH}/include/wallet/api/* $EXTERNAL_IOS_INCLUDE_DIR/haven
\ No newline at end of file
61
+mkdir -p $DEST_LIB_DIR
62
+mkdir -p $DEST_INCLUDE_DIR
63
+cp ${HAVEN_DIR_PATH}/lib-armv8-a/* $DEST_LIB_DIR
64
+cp ${HAVEN_DIR_PATH}/include/wallet/api/* $DEST_INCLUDE_DIR
\ No newline at end of file
scripts/ios/build_monero.sh
+6
-2
@@ -7,6 +7,8 @@ MONERO_DIR_PATH="${EXTERNAL_IOS_SOURCE_DIR}/monero"
7
MONERO_VERSION=tags/v0.17.3.0
8
BUILD_TYPE=release
9
PREFIX=${EXTERNAL_IOS_DIR}
10
+DEST_LIB_DIR=${EXTERNAL_IOS_LIB_DIR}/monero
11
+DEST_INCLUDE_DIR=${EXTERNAL_IOS_INCLUDE_DIR}/monero
12
13
echo "Cloning monero from - $MONERO_URL to - $MONERO_DIR_PATH"
14
git clone $MONERO_URL $MONERO_DIR_PATH
@@ -57,5 +59,7 @@ popd
59
done
60
61
#only for arm64
60
-cp ${MONERO_DIR_PATH}/lib-armv8-a/* $EXTERNAL_IOS_LIB_DIR
61
-cp ${MONERO_DIR_PATH}/include/wallet/api/* $EXTERNAL_IOS_INCLUDE_DIR
62
+mkdir -p $DEST_LIB_DIR
63
+mkdir -p $DEST_INCLUDE_DIR
64
+cp ${MONERO_DIR_PATH}/lib-armv8-a/* $DEST_LIB_DIR
65
+cp ${MONERO_DIR_PATH}/include/wallet/api/* $DEST_INCLUDE_DIR
scripts/ios/setup.sh
+15
-13
@@ -7,23 +7,25 @@ libtool -static -o libboost.a ./boost/*.a
7
libtool -static -o libhaven.a ./haven/*.a
8
libtool -static -o libmonero.a ./monero/*.a
9
10
-CW_HAVEN_EXTERNAL_LIB=../../../cw_haven/ios/External/ios/lib
11
-CW_HAVEN_EXTERNAL_INCLUDE=../../../cw_haven/ios/External/ios/include
12
-CW_MONERO_EXTERNAL=../../../cw_haven/ios/External/ios/lib
10
+CW_HAVEN_EXTERNAL_LIB=../../../../../cw_haven/ios/External/ios/lib
11
+CW_HAVEN_EXTERNAL_INCLUDE=../../../../../cw_haven/ios/External/ios/include
12
+CW_MONERO_EXTERNAL_LIB=../../../../../cw_monero/ios/External/ios/lib
13
+CW_MONERO_EXTERNAL_INCLUDE=../../../../../cw_monero/ios/External/ios/include
14
15
mkdir -p $CW_HAVEN_EXTERNAL_INCLUDE
16
mkdir -p $CW_HAVEN_EXTERNAL_LIB
16
-mkdir -p $CW_MONERO_EXTERNAL
17
+mkdir -p $CW_MONERO_EXTERNAL_LIB
18
18
-ln -s ./libboost.a $CW_HAVEN_EXTERNAL_LIB
19
-ln -s ./libcrypto.a $CW_HAVEN_EXTERNAL_LIB
20
-ln -s ./libssl.a $CW_HAVEN_EXTERNAL_LIB
21
-ln -s ./libsodium.a $CW_HAVEN_EXTERNAL_LIB
19
+ln ./libboost.a ${CW_HAVEN_EXTERNAL_LIB}/libboost.a
20
+ln ./libcrypto.a ${CW_HAVEN_EXTERNAL_LIB}/libcrypto.a
21
+ln ./libssl.a ${CW_HAVEN_EXTERNAL_LIB}/libssl.a
22
+ln ./libsodium.a ${CW_HAVEN_EXTERNAL_LIB}/libsodium.a
23
cp ./libhaven.a $CW_HAVEN_EXTERNAL_LIB
24
cp ../include/haven/* $CW_HAVEN_EXTERNAL_INCLUDE
25
25
-#ln -s ./libboost.a $CW_HAVEN_EXTERNAL_LIB
26
-#ln -s ./libcrypto.a $CW_HAVEN_EXTERNAL_LIB
27
-#ln -s ./libssl.a $CW_HAVEN_EXTERNAL_LIB
28
-#ln -s ./libsodium.a $CW_HAVEN_EXTERNAL_LIB
29
-#cp ./libhaven.a $CW_HAVEN_EXTERNAL_LIB
\ No newline at end of file
26
+ln ./libboost.a ${CW_MONERO_EXTERNAL_LIB}/libboost.a
27
+ln ./libcrypto.a ${CW_MONERO_EXTERNAL_LIB}/libcrypto.a
28
+ln ./libssl.a ${CW_MONERO_EXTERNAL_LIB}/libssl.a
29
+ln ./libsodium.a ${CW_MONERO_EXTERNAL_LIB}/libsodium.a
30
+cp ./libmonero.a $CW_MONERO_EXTERNAL_LIB
31
+cp ../include/monero/* $CW_MONERO_EXTERNAL_INCLUDE
\ No newline at end of file