From f2cac3cb1271ddef0a827d3d84bbb9caf6368c9b Mon Sep 17 00:00:00 2001 From: Chunting Gu Date: Wed, 12 Aug 2020 10:43:09 +0800 Subject: [PATCH 1/3] update notice about different branches --- README_zh_CN.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README_zh_CN.md b/README_zh_CN.md index c044016..6cee6c0 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -1,6 +1,9 @@ # Webcc - C++ HTTP 程序库 -**注意:master 分支的代码,避免了对 Boost 的依赖,但是需要 C++17 编译器;Asio 用的是独立版,并不是随 Boost 发布的 Asio。vs2013_compatible 分支则保留了对 Boost 的依赖,但是能在 VS2013 中编译。** +**注意:** + +- master 分支不需要 Boost,但是依赖 C++17,Asio 用的是独立版(已包含在 `third_party` 目录)。 +- [legacy](https://github.com/sprinfall/webcc/tree/legacy) 分支只使用了有限的 C++11 特性,需要 Boost 支撑(asio, system, filesystem, regex 等),**能支持较老的编译器,比如 VS2013 和 GCC 4.8**。 基于 [Asio](https://github.com/chriskohlhoff/asio) 开发的轻量级 C++ HTTP 程序库,同时支持客户端与服务端。 From a7b4d5eba80fe6ab352457bb61e75cb64c178785 Mon Sep 17 00:00:00 2001 From: Chunting Gu Date: Wed, 12 Aug 2020 10:51:24 +0800 Subject: [PATCH 2/3] add a note on branches --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index ee328b3..bb2aa55 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,10 @@ [__中文版__](README_zh_CN.md) +**NOTE:** +- **master** branch uses C++17 so it doesn't need _Boost_. Asio, as a header-only library, has been included in the `third_party` folder. +- **[legacy](https://github.com/sprinfall/webcc/tree/legacy)** branch only uses limited C++11 features, so it could be built by old compilers like _VS2013_ and _GCC 4.8_. + Lightweight C++ HTTP __client and server__ library based on [Asio](https://github.com/chriskohlhoff/asio) for __embedding__ purpose. Please turn to [doc](doc/) for more tutorials and guides. E.g., [Build Instructions](doc/Build-Instructions.md) and [Integrate Into Your Project](doc/Integrate-Into-Your-Project.md). From 8d63d68e97781ae761dcc3a0ef1f821ee1d89333 Mon Sep 17 00:00:00 2001 From: Chunting Gu Date: Wed, 12 Aug 2020 10:53:57 +0800 Subject: [PATCH 3/3] Update README.md --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bb2aa55..11974ec 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,13 @@ # Webcc - C++ HTTP Library -[__中文版__](README_zh_CN.md) - **NOTE:** - **master** branch uses C++17 so it doesn't need _Boost_. Asio, as a header-only library, has been included in the `third_party` folder. - **[legacy](https://github.com/sprinfall/webcc/tree/legacy)** branch only uses limited C++11 features, so it could be built by old compilers like _VS2013_ and _GCC 4.8_. +---- + +[__中文版 README__](README_zh_CN.md) + Lightweight C++ HTTP __client and server__ library based on [Asio](https://github.com/chriskohlhoff/asio) for __embedding__ purpose. Please turn to [doc](doc/) for more tutorials and guides. E.g., [Build Instructions](doc/Build-Instructions.md) and [Integrate Into Your Project](doc/Integrate-Into-Your-Project.md).