From 0ec4d68600b83d41d2e48ad35d18e2a00f234619 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 21 9月 2019 01:34:22 +0800
Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager into develop

---
 README.md |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index b18f2c7..3b096d7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Open License Manager
-[![Build Status](https://travis-ci.org/open-license-manager/open-license-manager.svg?branch=master)](https://travis-ci.org/open-license-manager/open-license-manager)
-[![experimental](http://badges.github.io/stability-badges/dist/experimental.svg)](http://github.com/badges/stability-badges)
+[![Build Status](https://travis-ci.org/open-license-manager/open-license-manager.svg?branch=develop)](https://travis-ci.org/open-license-manager/open-license-manager)
+[![experimental](http://badges.github.io/stability-badges/dist/experimental.svg)](http://github.com/badges/stability-badges)[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
 
 A copy protection, licensing software written in C/C++ for Windows and Linux.
 
@@ -11,11 +11,10 @@
 
 ## License
 The project is donated to the community. It comes with a very large freedom of use for everyone, and it will always be. 
-It uses a [BSD 3 clauses](https://opensource.org/licenses/BSD-3-Clause) licensing schema, that allows the inclusion in commercial software. 
+It uses a [BSD 3 clauses](https://opensource.org/licenses/BSD-3-Clause) licensing schema, that allows free modification and inclusion in commercial software. 
 
 
 ## Project Structure
-
 The software is made by 2 main sub-components:
  * a C library with no (or minimal) external dependencies (the part you have to integrate in your software).
  * a license generator written in C++ (allows you to generate a license).
@@ -29,14 +28,13 @@
  * bootstrap: allows to generate private keys and modify the library on the fly after the downloading.
  * testing  : runs the tests (and publish the results on cdash)
 
-How to build
-============
+# How to build
 
 Below an overview of the basic build procedure, you can find detailed instructions for each [supported environment](https://github.com/open-license-manager/open-license-manager/wiki/Build-the-library) in the wiki. 
 
 ## prerequisites
- * compilsers: GCC (Linux), MINGW or MSVC (Windows) 
- * tools/libs: cmake, boost, openssl (Linux/MINGW).
+ * compilsers: GCC (Linux) MINGW (Linux cross compile for Windows), MINGW or MSVC (Windows) 
+ * tools/libs: cmake, boost. If target is linux openssl is necessary.
 
 ```
 git clone https://github.com/open-license-manager/open-license-manager.git
@@ -54,7 +52,7 @@
 
 ## on Windows (with MSVC 2015)
 ```
-cmake .. -G "Visual Studio 14 2015 Win64" -DCMAKE_INSTALL_PREFIX=../install
+cmake .. -G "Visual Studio 14 2015 Win64" -DBOOST_ROOT="{Folder where boost is}" -DCMAKE_INSTALL_PREFIX=../install
 cmake --build . --target install --config Release
 ```
 
@@ -96,3 +94,7 @@
 $ ./example
 licence OK
 ```
+
+# How to contribute
+The project is not dead but we take our time to answer. The best interaction you can have with us is through the issue system. Have a look to the [contribution guidelines](blob/develop/CONTRIBUTING.md)
+We use [GitFlow](https://datasift.github.io/gitflow/IntroducingGitFlow.html) (or at least a subset of it). Remember to install the gitflow git plugin and use `develop` as default branch for your pull requests. 

--
Gitblit v1.9.1