diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-04-11 00:26:15 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-04-11 00:26:15 +0200 |
| commit | e9ca165b1ade5add159e36840ddb7c323c724f7b (patch) | |
| tree | b20eaeac31c1e33f9a3f27798b827033a7c55596 /src | |
| parent | Merge pull request #1949 (diff) | |
| parent | IOS CMAKE build settings (diff) | |
| download | monero-e9ca165b1ade5add159e36840ddb7c323c724f7b.tar.xz | |
Merge pull request #1950
f5bd3465 IOS CMAKE build settings (Jaquee)
d8a88d05 add IOS CMAKE toolchain (Jaquee)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | src/crypto/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/wallet/CMakeLists.txt | 7 |
3 files changed, 22 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7cf03db71..d83242a3c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -101,18 +101,24 @@ add_subdirectory(crypto) add_subdirectory(ringct) add_subdirectory(cryptonote_basic) add_subdirectory(cryptonote_core) -add_subdirectory(blockchain_db) +if(NOT IOS) + add_subdirectory(blockchain_db) +endif() add_subdirectory(mnemonics) -add_subdirectory(rpc) +if(NOT IOS) + add_subdirectory(rpc) +endif() add_subdirectory(wallet) -add_subdirectory(p2p) +if(NOT IOS) + add_subdirectory(p2p) +endif() add_subdirectory(cryptonote_protocol) - -add_subdirectory(simplewallet) -add_subdirectory(daemonizer) -add_subdirectory(daemon) - -add_subdirectory(blockchain_utilities) +if(NOT IOS) + add_subdirectory(simplewallet) + add_subdirectory(daemonizer) + add_subdirectory(daemon) + add_subdirectory(blockchain_utilities) +endif() if(PER_BLOCK_CHECKPOINT) add_subdirectory(blocks) diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt index c047b0042..277ee64c2 100644 --- a/src/crypto/CMakeLists.txt +++ b/src/crypto/CMakeLists.txt @@ -93,7 +93,7 @@ endif() # Because of the way Qt works on android with JNI, the code does not live in the main android thread # So this code runs with a 1 MB default stack size. # This will force the use of the heap for the allocation of the scratchpad -if (ANDROID) +if (ANDROID OR IOS) if( BUILD_GUI_DEPS ) add_definitions(-DFORCE_USE_HEAP=1) endif() diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt index aed021b9c..2e7610b64 100644 --- a/src/wallet/CMakeLists.txt +++ b/src/wallet/CMakeLists.txt @@ -132,8 +132,13 @@ if (BUILD_GUI_DEPS) list(APPEND objlibs $<TARGET_OBJECTS:obj_${lib}>) # matches naming convention in src/CMakeLists.txt endforeach() add_library(wallet_merged STATIC ${objlibs}) + if(IOS) + set(lib_folder lib-${ARCH}) + else() + set(lib_folder lib) + endif() install(TARGETS wallet_merged - ARCHIVE DESTINATION lib) + ARCHIVE DESTINATION ${lib_folder}) install(FILES ${wallet_api_headers} DESTINATION include/wallet) |