diff options
| author | Jaquee <jaquee.monero@gmail.com> | 2016-12-09 11:12:53 +0100 |
|---|---|---|
| committer | Jaquee <jaquee.monero@gmail.com> | 2016-12-09 11:31:33 +0100 |
| commit | 401d09fab7f911ea7d22e5befc446f156ddac046 (patch) | |
| tree | 444ce857e292444ffc0492f3d0974f8662903283 | |
| parent | 5437820af0f4e04563b158f6f1e982479ae8a333 (diff) | |
| download | monzero-gui-401d09fab7f911ea7d22e5befc446f156ddac046.tar.gz monzero-gui-401d09fab7f911ea7d22e5befc446f156ddac046.tar.xz monzero-gui-401d09fab7f911ea7d22e5befc446f156ddac046.zip | |
Don't build monerod on win32
Signed-off-by: Jaquee <jaquee.monero@gmail.com>
| -rwxr-xr-x | build.sh | 2 | ||||
| -rwxr-xr-x | get_libwallet_api.sh | 12 |
2 files changed, 10 insertions, 4 deletions
@@ -48,7 +48,9 @@ qmake ../monero-core.pro "$CONFIG" make # Copy monerod to bin folder +if [ "$platform" != "mingw32" ]; then cp ../$MONERO_DIR/bin/$MONEROD_EXEC $BIN_PATH +fi # make deploy popd diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index 6926d977..06309ecd 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -78,10 +78,14 @@ eval $make_exec install -j$CPU_CORE_COUNT popd # Build monerod -pushd $MONERO_DIR/build/release/src/daemon -eval $make_exec -j$CPU_CORE_COUNT -eval $make_exec install -j$CPU_CORE_COUNT -popd +# win32 need to build daemon manually with msys2 toolchain +if [ "$platform" != "mingw32" ]; then + pushd $MONERO_DIR/build/release/src/daemon + eval make -j$CPU_CORE_COUNT + eval make install -j$CPU_CORE_COUNT + popd +fi + # unbound is one more dependency. can't be merged to the wallet_merged # since filename conflict (random.c.obj) |