diff --git a/README.md b/README.md index 0642679..301632f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ ![Cover Image](docs/images/cover-image.png) -[![Build Status](https://travis-ci.org/jimevins/glabels-qt.svg?branch=master)](https://travis-ci.org/jimevins/glabels-qt) +[![Travis Build Status](https://travis-ci.org/jimevins/glabels-qt.svg?branch=master)](https://travis-ci.org/jimevins/glabels-qt) +[![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/github/jimevins/glabels-qt?branch=master&svg=true)](https://ci.appveyor.com/project/jimevins/glabels-qt) ******************************************************************************* @@ -43,10 +44,11 @@ expect compatibility or consistency of features between snapshots. | Platform | Files | Notes | |:---------|:------|:------| | Linux x86_64 [AppImage](http:appimage.org) | [glabels-continuous-x86_64.AppImage](https://github.com/jimevins/glabels-qt/releases/download/continuous/glabels-continuous-x86_64.AppImage) | Download, make it executable, and run! | -| Source Code TAR.GZ | [continuous.tar.gz](https://github.com/jimevins/glabels-qt/archive/continuous.tar.gz) | | -| Source Code ZIP | [continuous.zip](https://github.com/jimevins/glabels-qt/archive/continuous.tar.gz) | | | Archlinux | [Archlinux User Repository Page](https://aur.archlinux.org/packages/glabels-qt-git/) | Maintained by [Mario Blättermann](https://github.com/mariobl) | | Ubuntu | [PPA Page](https://code.launchpad.net/~krisives/+archive/ubuntu/glabels-qt) | Maintained by [Kristopher Ives](https://github.com/krisives).
https://github.com/krisives/glabels-qt-packaging | +| Windows x86_64 | [glabels-3.99.0-win64.exe](https://github.com/jimevins/glabels-qt/releases/download/continuous/glabels-3.99.0-win64.exe) | Windows installer | +| Source Code TAR.GZ | [continuous.tar.gz](https://github.com/jimevins/glabels-qt/archive/continuous.tar.gz) | | +| Source Code ZIP | [continuous.zip](https://github.com/jimevins/glabels-qt/archive/continuous.tar.gz) | | ## Build Instructions diff --git a/docs/BUILD-INSTRUCTIONS-WINDOWS.md b/docs/BUILD-INSTRUCTIONS-WINDOWS.md index a710e1c..83f8921 100644 --- a/docs/BUILD-INSTRUCTIONS-WINDOWS.md +++ b/docs/BUILD-INSTRUCTIONS-WINDOWS.md @@ -3,8 +3,60 @@ gLabels Windows Build Instructions gLabels for Windows can be built using one of the following toolchains: -- [MSYS/MINGW](#msysmingw) - [Visual Studio](#visual-studio) +- [MSYS/MINGW](#msysmingw) + + +Visual Studio +------------- + +### Prerequisites + +- Visual Studio (these instructions are for _Visual Studio 15 2017 Win64_) +- CMake 3.2+ +- Qt5 5.9+ for your version of Visual Studio +- NSIS 3.03+ (optional -- for creating an installer) + +Make sure that CMake and the Qt tools are in your executable search path. For example, you may need to add something like the following to your PATH environment variable: + +``` +c:\Program Files\CMake\bin +c:\Qt\5.9.3\msvc2017_64\bin +``` + +The exact paths will depend on the version of Qt and CMake you have installed. + +### Compile + +From a Windows Power Shell, use CMake to create and build a Visual Studio Solution: + +
+> cd glabels_source_directory
+> mkdir build
+> cd build
+> cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_PREFIX_PATH="c:\qt\5.9.3\msvc2017_64" ..
+> cmake --build . --config Release 
+
+ +### Install + +To install, run a Windows Power Shell `as administrator`, and type the following commands: + +
+> cd glabels_source_directory/build
+> cmake --build . --config Release --target INSTALL
+
+ +### Create installer + +To create a Windows installer, run the following commands: + +
+> cd glabels_source_directory/build
+> cpack -C Release -G NSIS
+
+ + MSYS/MINGW @@ -47,42 +99,3 @@ $ cd glabels_source_directory/build $ make install - - -Visual Studio -------------- - -### Prerequisites - -- Visual Studio (these instructions are for _Visual Studio 15 2017 Win64_) -- CMake 3.2+ -- Qt5 5.9+ for your version of Visual Studio - -Make sure that CMake and the Qt tools are in your executable search path. For example, you may need to add something like the following to your PATH environment variable: - -``` -c:\Program Files\CMake\bin -c:\Qt\5.9.3\msvc2017_64\bin -``` - -The exact paths will depend on the version of Qt and CMake you have installed. - -### Compile and Install - -From a Windows Power Shell, use CMake to create and build a Visual Studio Solution: - -
-> cd glabels_source_directory
-> mkdir build
-> cd build
-> cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_PREFIX_PATH="c:\qt\5.9.3\msvc2017_64" ..
-> cmake --build . --config Release 
-
- -To install, run a Windows Power Shell `as administrator`, and type the following commands: - -
-> cd glabels_source_directory/build
-> cmake --build . --config Release --target INSTALL
-
-