libunbound is one more dependency

This commit is contained in:
Ilya Kitaev 2016-09-03 13:06:44 +03:00
parent 2ea6435d43
commit c87eed558f
2 changed files with 14 additions and 6 deletions

View file

@ -29,19 +29,18 @@ rm -fr $BITMONERO_DIR/include
mkdir -p $BITMONERO_DIR/build/release mkdir -p $BITMONERO_DIR/build/release
pushd $BITMONERO_DIR/build/release pushd $BITMONERO_DIR/build/release
if [ "$(uname)" == "Darwin" ]; then if [ "$(uname)" == "Darwin" ]; then
# Do something under Mac OS X platform # Do something under Mac OS X platform
cmake -D CMAKE_BUILD_TYPE=Release -D STATIC=ON -D CMAKE_INSTALL_PREFIX="$BITMONERO_DIR" ../.. cmake -D CMAKE_BUILD_TYPE=Release -D STATIC=ON -D BUILD_GUI_DEPS=ON -D CMAKE_INSTALL_PREFIX="$BITMONERO_DIR" ../..
elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
# Do something under GNU/Linux platform # Do something under GNU/Linux platform
cmake -D CMAKE_BUILD_TYPE=Release -D STATIC=ON -D CMAKE_INSTALL_PREFIX="$BITMONERO_DIR" ../.. cmake -D CMAKE_BUILD_TYPE=Release -D STATIC=ON -D BUILD_GUI_DEPS=ON -D CMAKE_INSTALL_PREFIX="$BITMONERO_DIR" ../..
elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW64_NT" ]; then elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW64_NT" ]; then
# Do something under Windows NT platform # Do something under Windows NT platform
cmake -D CMAKE_BUILD_TYPE=Release -D STATIC=ON -D CMAKE_INSTALL_PREFIX="$BITMONERO_DIR" -G "MSYS Makefiles" ../.. cmake -D CMAKE_BUILD_TYPE=Release -D STATIC=ON -D BUILD_GUI_DEPS=ON -D CMAKE_INSTALL_PREFIX="$BITMONERO_DIR" -G "MSYS Makefiles" ../..
elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW32_NT" ]; then elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW32_NT" ]; then
# Do something under Windows NT platform # Do something under Windows NT platform
cmake -D CMAKE_BUILD_TYPE=Release -D STATIC=ON -D CMAKE_INSTALL_PREFIX="$BITMONERO_DIR" -G "MSYS Makefiles" ../.. cmake -D CMAKE_BUILD_TYPE=Release -D STATIC=ON -D BUILD_GUI_DEPS=ON -D CMAKE_INSTALL_PREFIX="$BITMONERO_DIR" -G "MSYS Makefiles" ../..
fi fi
@ -49,6 +48,14 @@ pushd $BITMONERO_DIR/build/release/src/wallet
make -j$CPU_CORE_COUNT make -j$CPU_CORE_COUNT
make install -j$CPU_CORE_COUNT make install -j$CPU_CORE_COUNT
popd popd
# unbound is one more dependency. can't be merged to the wallet_merged
# since filename conflict (random.c.obj)
pushd $BITMONERO_DIR/build/release/external/unbound
make -j$CPU_CORE_COUNT
make install -j$CPU_CORE_COUNT
popd
popd popd

View file

@ -45,7 +45,8 @@ SOURCES = *.qml \
} }
LIBS += -L$$WALLET_ROOT/lib \ LIBS += -L$$WALLET_ROOT/lib \
-lwallet_merged -lwallet_merged \
-lunbound
win32 { win32 {
#QMAKE_LFLAGS += -static #QMAKE_LFLAGS += -static