From dbec43f51571d5d1dc9d6f42fa3020520bb5a5d0 Mon Sep 17 00:00:00 2001 From: Paul Buxton Date: Sun, 25 Aug 2019 12:35:35 +0100 Subject: [PATCH] Fix some documentation Fix a broken link in CONTRIBUTING.md Add some missing packages to the MXE make information Add some extra info for fetching other dependancies Signed-off-by: Paul Buxton paulbuxton.mail@googlemail.com --- CONTRIBUTING.md | 2 +- packaging/windows/mxe-based-build.sh | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6d80021..32804c5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -87,5 +87,5 @@ In order to make reviews simpler and have contributions merged faster in the cod [8]: https://subsurface-divelog.org/building/ [9]: https://gerrit-review.googlesource.com/Documentation/user-signedoffby.html [10]: https://subsurface-divelog.org/wp-content/uploads/2011/10/Screenshot-gitk-subsurface-1.png "Example with gitk" -[11]: https://github.com/Subsurface-divelog/subsurface/blob/master/CodingStyle +[11]: https://github.com/Subsurface-divelog/subsurface/blob/master/CodingStyle.md [12]: https://github.com/Subsurface-divelog/subsurface/blob/master/CONVENTIONS.md diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh index b5e9992..6d680f8 100755 --- a/packaging/windows/mxe-based-build.sh +++ b/packaging/windows/mxe-based-build.sh @@ -9,6 +9,9 @@ # git clone https://github.com/mxe/mxe # cd mxe # +# Also ensure you have the required prerequisites for building mxe +# these can be found @ https://mxe.cc/#requirements +# # now create a file settings.mk #--- # # This variable controls the number of compilation processes @@ -27,7 +30,7 @@ # # now you can start the build # -# make libxml2 libxslt libusb1 libzip libssh2 libftdi1 curl qt5 nsis +# make libxml2 libxslt libusb1 libzip libssh2 libftdi1 curl qt5 nsis libgit2 qtwebkit # # (if you intend to build Subsurface without user space FTDI support # you can drop libftdi1 from that list and start this script with @@ -51,6 +54,22 @@ # # ~/src/win32 <- build directory # +# To fetch the other dependancies (grantlee, googlemaps, hidapi) +# cd ~/src +# git clone https://github.com/steveire/grantlee.git +# cd grantlee +# git checkout +# git pull +# cd .. +# git clone https://github.com/vladest/googlemaps.git +# cd googlemaps +# git checkout +# git pull +# cd .. +# git clone https://github.com/signal11/hidapi.git +# cd hidapi/ +# git checkout +# git pull # then start this script from ~/src/win32 # # cd ~/src/win32 -- 2.7.4