From ce698e4b50784e1e80b448293417fb8d228c1c1f Mon Sep 17 00:00:00 2001 From: RainX Date: Thu, 24 Aug 2017 10:34:49 +0800 Subject: [PATCH 1/2] fix mis-type Trade Servers to Servers --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c08cf0d..adf5e12 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ | | +----------------------------v---+-----------------------------+ | | -| Tong Da Xin Trade Servers | +| Tong Da Xin Servers | | | | | | | From cd9c3d793de699d5997369de2b96b152f5cbdd7a Mon Sep 17 00:00:00 2001 From: RainX Date: Mon, 28 Aug 2017 14:44:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20some=20doc=20,=20thx=20@=E9=98=BF?= =?UTF-8?q?=E4=B8=98Edward?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index adf5e12..64e3f57 100644 --- a/README.md +++ b/README.md @@ -60,21 +60,21 @@ 3. 安装Qt 并配置VS2015 C++ Compiler 4. 配置git 5. 安装cmake -6. 配置git,mingz,cmake命令在系统path中可以调用 +6. 配置git,cmake命令在系统path中可以调用 7. 安装msys2 (openssl编译需要） -8. 在msys2中安装perl, cmake +8. 在msys2中安装perl, cmake (如果不使用msys2的shell编译，安装msys2后还需要把 `\usr\bin`加入到系统PATH，不然用pacman安装了Perl以后，编译openssl会找不到perl。） ```bash pacman -S perl pacman -S make ``` -9. 配置conan.conf +9. 配置`\.conan\profile\default` 或者 `conan.conf` ``` [general] bash_path="c:\msys32\bin\bash" - .. + [settings_defaults] arch=x86 compiler=Visual Studio