diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-12-09 00:08:48 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-12-09 00:08:48 +0200 |
| commit | f88b011adfb960c226416792bbb9ad8d7e4ddb3f (patch) | |
| tree | d4e5d0104217466fd66e32c42dd970994242f29e | |
| parent | 73ca4da6c94dd2f3f7296b7af053db6ce6b35770 (diff) | |
| parent | 7974aba1cb34139fad82df169d161ba5d411c35e (diff) | |
| download | monzero-gui-f88b011adfb960c226416792bbb9ad8d7e4ddb3f.tar.gz monzero-gui-f88b011adfb960c226416792bbb9ad8d7e4ddb3f.tar.xz monzero-gui-f88b011adfb960c226416792bbb9ad8d7e4ddb3f.zip | |
Merge pull request #239
7974aba win32: static boost + target i686 (Jaquee)
| -rwxr-xr-x | get_libwallet_api.sh | 4 | ||||
| -rw-r--r-- | monero-core.pro | 20 |
2 files changed, 14 insertions, 10 deletions
diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index 76d1123d..9f69cade 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -59,7 +59,7 @@ elif [ "$platform" == "mingw64" ]; then elif [ "$platform" == "mingw32" ]; then # Do something under Windows NT platform echo "Configuring build for MINGW32.." - cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D STATIC=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" -G "MSYS Makefiles" ../.. + cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D STATIC=ON -D ARCH="i686" -D BUILD_64=OFF -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" -G "MSYS Makefiles" ../.. make_exec="mingw32-make" else echo "Unsupported platform: $platform" @@ -83,7 +83,7 @@ if [ "$platform" != "linux" ]; then pushd $MONERO_DIR/build/release/external/unbound # no need to make, it was already built as dependency for libwallet # make -j$CPU_CORE_COUNT - make install -j$CPU_CORE_COUNT + $make_exec install -j$CPU_CORE_COUNT popd fi diff --git a/monero-core.pro b/monero-core.pro index 5c48db45..96cb0065 100644 --- a/monero-core.pro +++ b/monero-core.pro @@ -79,6 +79,9 @@ win32 { MSYS_PATH=c:/msys32/mingw32 } + # boost root path + BOOST_PATH=/c/Qt/Qt5.7.0/Tools/mingw530_32/boost + !contains(QMAKE_TARGET.arch, x86_64) { message("Target is 32bit") ## Windows x86 (32bit) specific build here @@ -90,17 +93,18 @@ win32 { } LIBS+=-L$$MSYS_PATH/lib + LIBS+=-L$$BOOST_PATH/lib 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 \ + -lboost_serialization-mt-s \ + -lboost_thread-mt-s \ + -lboost_system-mt-s \ + -lboost_date_time-mt-s \ + -lboost_filesystem-mt-s \ + -lboost_regex-mt-s \ + -lboost_chrono-mt-s \ + -lboost_program_options-mt-s \ -lssl \ -lcrypto \ -Wl,-Bdynamic \ |