diff options
| author | Jonathan White <support@dmapps.us> | 2018-08-24 15:40:41 +0300 |
|---|---|---|
| committer | Jonathan White <support@dmapps.us> | 2018-08-24 16:42:38 +0300 |
| commit | ca27fb06d5aa69b0ad079552a12b66ad4c364828 (patch) | |
| tree | 08f1a302952b5073e51a392351e5842427bbba9c /INSTALL.md | |
| parent | 8b5530d2ba4e1803f3506d7d7b75c1168b21eb3d (diff) | |
| parent | 6fe821c30ec747e7fda0a8abe75d774d61a21054 (diff) | |
Merge branch 'master'
Conflicts:
INSTALL.md
release-tool
src/browser/BrowserOptionDialog.cpp
src/browser/BrowserService.cpp
src/browser/BrowserService.h
src/browser/NativeMessagingBase.h
src/browser/NativeMessagingHost.h
src/core/Uuid.cpp
src/gui/DatabaseTabWidget.cpp
src/gui/DatabaseWidget.cpp
src/gui/EditWidget.cpp
src/gui/MainWindow.cpp
src/gui/MainWindow.ui
src/proxy/NativeMessagingHost.h
src/sshagent/ASN1Key.cpp
Diffstat (limited to 'INSTALL.md')
| -rw-r--r-- | INSTALL.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/INSTALL.md b/INSTALL.md index 1a23397d3..00a701b24 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -38,6 +38,7 @@ Prepare the Building Environment Build Steps =========== +We recommend using the release tool to perform builds, please read up-to-date instructions [on our wiki](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC#building-using-the-release-tool). To compile from source, open a **Terminal (on Linux/MacOS)** or a **MSYS2-MinGW shell (on Windows)**<br/> **Note:** on Windows make sure you are using a **MINGW shell** by checking the label before the current path @@ -75,6 +76,8 @@ cmake -DWITH_XC_ALL=ON .. make ``` +If you are on Windows, you may have to add ```-G "MSYS Makefiles"``` to the beginning of the cmake command. See the [Windows Build Instructions](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC#windows) for more information. + These steps place the compiled KeePassXC binary inside the `./build/src/` directory. (Note the cmake notes/options below.) |