From d880441f7e2631854803dd95458d11bef1a145a3 Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Mon, 4 Jul 2016 18:17:26 +0300 Subject: [PATCH] MSYS2/Win64 build fixed --- get_libwallet_api.sh | 4 ++-- monero-core.pro | 31 ++++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index 7410365a..60f86d32 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -32,10 +32,10 @@ elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then cmake -D CMAKE_BUILD_TYPE=Release -D STATIC=ON -D CMAKE_INSTALL_PREFIX="$BITMONERO_DIR" ../.. elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW64_NT" ]; then # Do something under Windows NT platform - cmake -D CMAKE_BUILD_TYPE=Release -D STATIC=ON -D CMAKE_INSTALL_PREFIX="$BITMONERO_DIR" -G "MinGW Makefiles" ../.. - + cmake -D CMAKE_BUILD_TYPE=Release -D STATIC=ON -D CMAKE_INSTALL_PREFIX="$BITMONERO_DIR" -G "MSYS Makefiles" ../.. elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW32_NT" ]; then # Do something under Windows NT platform + cmake -D CMAKE_BUILD_TYPE=Release -D STATIC=ON -D CMAKE_INSTALL_PREFIX="$BITMONERO_DIR" -G "MSYS Makefiles" ../.. fi diff --git a/monero-core.pro b/monero-core.pro index 8ce4a16a..b345a3d7 100644 --- a/monero-core.pro +++ b/monero-core.pro @@ -42,12 +42,41 @@ SOURCES = *.qml \ LIBS += -L$$WALLET_ROOT/lib \ -lwallet_merged \ + -lwallet_merged2 + +win32 { + #QMAKE_LFLAGS += -static + LIBS+= \ + -Wl,-Bstatic \ + -lboost_serialization-mt \ + -lboost_thread-mt \ + -lboost_system-mt \ + -lboost_date_time-mt \ + -lboost_filesystem-mt \ + -lboost_regex-mt \ + -lboost_chrono-mt \ + -lboost_program_options-mt \ + -lssl \ + -lcrypto \ + -Wl,-Bdynamic \ + -lws2_32 \ + -lwsock32 \ + -lIphlpapi \ + -lgdi32 +} + +unix { + LIBS+= \ -lboost_serialization \ -lboost_thread \ -lboost_system \ -lboost_date_time \ -lboost_filesystem \ - -lboost_regex + -lboost_regex \ + -lboost_chrono \ + -lboost_program_options + +}