IOS CMAKE build settings

This commit is contained in:
Jaquee
2017-04-02 12:19:25 +02:00
parent d8a88d058e
commit f5bd346573
6 changed files with 42 additions and 21 deletions
+15 -9
View File
@@ -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)
+1 -1
View File
@@ -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()
+6 -1
View File
@@ -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)