Browse Source

Set different linker options for MacOS.

patch-3
Artem Pikulin 7 years ago
parent
commit
3afbc2ce67
  1. 3
      CMakeLists.txt
  2. 8
      iguana/exchanges/CMakeLists.txt
  3. 2
      iguana/exchanges/LP_etomic.c

3
CMakeLists.txt

@ -7,6 +7,9 @@ HunterGate(
) )
project(SuperNET) project(SuperNET)
set(DEPS_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install) set(DEPS_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED True)
set(CMAKE_CXX_EXTENSIONS Off)
include(cmake/DownloadProject.cmake) include(cmake/DownloadProject.cmake)

8
iguana/exchanges/CMakeLists.txt

@ -1,6 +1,12 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR})
set(MM_SOURCES mm.c ../mini-gmp.c ../groestl.c ../segwit_addr.c ../keccak.c) set(MM_SOURCES mm.c ../mini-gmp.c ../groestl.c ../segwit_addr.c ../keccak.c)
set(MM_LIBS ${NANOMSG_LIBRARY} curl pthread libcrypto777 libjpeg libsecp256k1 "-Wl,--allow-multiple-definition") if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(MM_LIBS ${NANOMSG_LIBRARY} curl pthread libcrypto777 libjpeg libsecp256k1)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(MM_LIBS ${NANOMSG_LIBRARY} curl pthread libcrypto777 libjpeg libsecp256k1 "-Wl,--allow-multiple-definition")
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(MM_LIBS ${NANOMSG_LIBRARY} curl pthread libcrypto777 libjpeg libsecp256k1 "-m")
endif()
add_executable(marketmaker-testnet ${MM_SOURCES}) add_executable(marketmaker-testnet ${MM_SOURCES})
add_executable(marketmaker-mainnet ${MM_SOURCES}) add_executable(marketmaker-mainnet ${MM_SOURCES})
include_directories(../../crypto777) include_directories(../../crypto777)

2
iguana/exchanges/LP_etomic.c

@ -142,7 +142,7 @@ uint8_t LP_etomic_verify_alice_payment(struct basilisk_swap *swap, char *txId)
} }
EthTxData data = getEthTxData(txId); EthTxData data = getEthTxData(txId);
if (strcmp(data.to, ETOMIC_ALICECONTRACT) != 0) { if (strcmp(data.to, ETOMIC_ALICECONTRACT) != 0) {
printf("Alice payment %s was not sent to wrong address %s\n", txId, data.to); printf("Alice payment %s was sent to wrong address %s\n", txId, data.to);
return(0); return(0);
} }
if (strcmp(data.from, swap->I.etomicdest) != 0) { if (strcmp(data.from, swap->I.etomicdest) != 0) {

Loading…
Cancel
Save