monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 10:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

hack to successfull linking for MSYS2

Browse source
This commit is contained in:
Ilya Kitaev 2016-07-04 17:59:53 +03:00
parent 083380cb8f
commit d27b883b2d
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/wallet/CMakeLists.txt
View file

@ -76,11 +76,15 @@ target_link_libraries(wallet
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
# set(libs_to_merge wallet cryptonote_core mnemonics common crypto ${UNBOUND_LIBRARY} )
set(libs_to_merge wallet cryptonote_core mnemonics common crypto) set(libs_to_merge wallet cryptonote_core mnemonics common crypto)
#MERGE_STATIC_LIBS(wallet_merged wallet_merged "${libs_to_merge}") #MERGE_STATIC_LIBS(wallet_merged wallet_merged "${libs_to_merge}")
merge_static_libs(wallet_merged "${libs_to_merge}") merge_static_libs(wallet_merged "${libs_to_merge}")
install(TARGETS wallet_merged # hack - repack libunbound into another static lib - there's conflicting object file "random.c.obj"
merge_static_libs(wallet_merged2 "${UNBOUND_LIBRARY}")
install(TARGETS wallet_merged wallet_merged2
ARCHIVE DESTINATION lib) ARCHIVE DESTINATION lib)
install(FILES ${wallet_api_headers} install(FILES ${wallet_api_headers}