From 6d00c3ecd267501fb3adb2de9f7724a1ff4aa0ea Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Mon, 25 Jan 2021 11:46:00 -0500 Subject: [PATCH] update windows parts * document need for ninja-build package * update contrib/windows.sh, remove -DCROSS_COMPILE option, set -e and set +x --- contrib/windows.sh | 2 ++ readme.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/windows.sh b/contrib/windows.sh index 6107cc464..dddecd94a 100755 --- a/contrib/windows.sh +++ b/contrib/windows.sh @@ -1,4 +1,6 @@ #!/bin/bash +set -e +set +x mkdir -p build-windows cd build-windows cmake -G Ninja -DCMAKE_EXE_LINKER_FLAGS=-fstack-protector -DCMAKE_CXX_FLAGS=-fdiagnostics-color=always -DCMAKE_TOOLCHAIN_FILE=../contrib/cross/mingw64.cmake -DBUILD_STATIC_DEPS=ON -DBUILD_PACKAGE=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DWITH_TESTS=OFF -DNATIVE_BUILD=OFF -DSTATIC_LINK=ON -DWITH_SYSTEMD=OFF -DFORCE_LOKIMQ_SUBMODULE=ON -DSUBMODULE_CHECK=OFF -DWITH_LTO=OFF -DCMAKE_BUILD_TYPE=Release .. diff --git a/readme.md b/readme.md index 365571309..1f04a88bd 100644 --- a/readme.md +++ b/readme.md @@ -81,7 +81,7 @@ additional build requirements: setup: - $ sudo apt install build-essential cmake git pkg-config mingw-w64 nsis + $ sudo apt install build-essential cmake git pkg-config mingw-w64 nsis ninja-build building: