diff options
| author | cyan <cyjan@mrcyjanek.net> | 2024-11-01 19:45:19 +0000 |
|---|---|---|
| committer | cyan <cyjan@mrcyjanek.net> | 2024-11-01 19:45:19 +0000 |
| commit | 0f2f9ad40cb8bfc3fe946a92114aaa482f54e9db (patch) | |
| tree | 5695b0bf484ecb11e2c4fb1ae58f3671444d0ca4 | |
| parent | c8ad2e6638b199312a11d2ceb8ae00356a4ed8ec (diff) | |
unboost the cmakelists
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | build_single.sh | 6 | ||||
| -rw-r--r-- | monero_libwallet2_api_c/CMakeLists.txt | 12 |
3 files changed, 10 insertions, 10 deletions
@@ -9,7 +9,7 @@ TL;DR: ```bash $ rm -rf monero wownero release $ git submodule update --init --recursive --force -$ for coin in monero wownero; do ./apply_patches $coin; done +$ for coin in monero wownero zano; do ./apply_patches $coin; done $ ./build_single monero $(gcc -dumpmachine) -j$(nproc) ``` diff --git a/build_single.sh b/build_single.sh index aab599f..7146f11 100755 --- a/build_single.sh +++ b/build_single.sh @@ -20,14 +20,14 @@ set -e repo=$1 if [[ "x$repo" == "x" ]]; then - echo "Usage: $0 monero/wownero $(gcc -dumpmachine) -j$proccount" + echo "Usage: $0 monero/wownero/zano $(gcc -dumpmachine) -j$proccount" exit 1 fi if [[ "x$repo" != "xwownero" && "x$repo" != "xmonero" && "x$repo" != "xzano" ]]; then - echo "Usage: $0 monero/wownero $(gcc -dumpmachine) -j$proccount" - echo "Invalid target given, only monero and wownero are supported targets" + echo "Usage: $0 monero/wownero/zano $(gcc -dumpmachine) -j$proccount" + echo "Invalid target given" exit 1 fi diff --git a/monero_libwallet2_api_c/CMakeLists.txt b/monero_libwallet2_api_c/CMakeLists.txt index c2e1f31..df0d5fc 100644 --- a/monero_libwallet2_api_c/CMakeLists.txt +++ b/monero_libwallet2_api_c/CMakeLists.txt @@ -72,15 +72,15 @@ set_target_properties(ssl PROPERTIES IMPORTED_LOCATION if(${HOST_ABI} STREQUAL "x86_64-linux-android" OR ${HOST_ABI} STREQUAL "aarch64-linux-android" OR ${HOST_ABI} STREQUAL "armv7a-linux-androideabi" OR ${HOST_ABI} STREQUAL "i686-linux-android") set(CMAKE_LINKER ${HOST_ABI}-ld) - set(BOOST_WTF "-mt-s") + set(BOOST_WTF "") set(BOOST_WTF_DATE_TIME "${BOOST_WTF}") set(BOOST_WTF_PART "") elseif(${HOST_ABI} STREQUAL "aarch64-linux-gnu") - set(BOOST_WTF "-mt") + set(BOOST_WTF "") set(BOOST_WTF_DATE_TIME "${BOOST_WTF}") set(BOOST_WTF_PART "") elseif(${HOST_ABI} STREQUAL "x86_64-w64-mingw32" OR ${HOST_ABI} STREQUAL "i686-w64-mingw32") - set(BOOST_WTF "-mt-s") + set(BOOST_WTF "") set(BOOST_WTF_DATE_TIME "${BOOST_WTF}") set(BOOST_WTF_PART "_win32") elseif(${HOST_ABI} STREQUAL "host-apple-ios") @@ -88,11 +88,11 @@ elseif(${HOST_ABI} STREQUAL "host-apple-ios") set(BOOST_WTF_DATE_TIME "${BOOST_WTF}") set(BOOST_WTF_PART "") elseif(${HOST_ABI} STREQUAL "x86_64-linux-gnu" AND ${MONERO_FLAVOR} STREQUAL "zano") - set(BOOST_WTF "-mt-x64") - set(BOOST_WTF_DATE_TIME "-mt-s-x64") + set(BOOST_WTF "") + set(BOOST_WTF_DATE_TIME "${BOOST_WTF}") set(BOOST_WTF_PART "") else() - set(BOOST_WTF "-mt") + set(BOOST_WTF "") set(BOOST_WTF_DATE_TIME "${BOOST_WTF}") set(BOOST_WTF_PART "") endif() |
