From 16eb0bf44c3ca1bf9e0f4c70b7f65e51bc6c090e Mon Sep 17 00:00:00 2001 From: nanoric Date: Tue, 22 Jan 2019 03:36:05 -0400 Subject: [PATCH] [Mod] rename Readme.md into README.md [Mod] updated build instruments [Mod] move all documents into /doc --- binding/{Readme.md => README.md} | 2 +- .../{Build.Linux.md => doc/build.linux.md} | 0 binding/{Build.md => doc/build.md} | 4 ++-- .../build.windows.md} | 21 +++++++++---------- 4 files changed, 13 insertions(+), 14 deletions(-) rename binding/{Readme.md => README.md} (86%) rename binding/{Build.Linux.md => doc/build.linux.md} (100%) rename binding/{Build.md => doc/build.md} (79%) rename binding/{Build.Windows.md => doc/build.windows.md} (54%) diff --git a/binding/Readme.md b/binding/README.md similarity index 86% rename from binding/Readme.md rename to binding/README.md index 6cc90a90..c1db0268 100644 --- a/binding/Readme.md +++ b/binding/README.md @@ -4,7 +4,7 @@ 所有的封装都是使用脚本生成的,使用的脚本为autocxxpy -若要看如何构建,请看Build.md +若要看如何构建,请看[build.md](./doc/build.md) --- diff --git a/binding/Build.Linux.md b/binding/doc/build.linux.md similarity index 100% rename from binding/Build.Linux.md rename to binding/doc/build.linux.md diff --git a/binding/Build.md b/binding/doc/build.md similarity index 79% rename from binding/Build.md rename to binding/doc/build.md index b8cead47..ed4ecde2 100644 --- a/binding/Build.md +++ b/binding/doc/build.md @@ -13,5 +13,5 @@ vnpy.binding使用CMake作为构建系统,正常地使用CMake去构建即可 ## 简单教程 针对不同操作系统有不同的构建方式,请查看对应的文件。 -* Windows : Build.Windows.md -* Linux : Build.Linux.md +* Windows : [build.windows.md](./build.windows.md) +* Linux : [build.linux.md](./build.linux.md) diff --git a/binding/Build.Windows.md b/binding/doc/build.windows.md similarity index 54% rename from binding/Build.Windows.md rename to binding/doc/build.windows.md index dbb3dee7..2fd3807f 100644 --- a/binding/Build.Windows.md +++ b/binding/doc/build.windows.md @@ -9,19 +9,18 @@ ## 编译步骤 -确保你安装好了Python3,CMake还有Visual Studio和C++编译环境之后,到vnpy/binding目录下打开控制台,执行CMake: +确保你安装好了Python3,CMake还有Visual Studio和C++编译环境,下载好[vnpy]并解压。 +打开开始菜单-Visual Studio 2017-x64 Native Tools Command Prompt for VS 2017 +在弹出的控制台中运行以下命令:(假设你解压到C:\vnpy下) ```bat -mkdir build -cd build -cmake-gui .. -``` -> 如果提示找不到Python,请自行设置USER_PYTHON_INCLUDE_DIR和USER_PYTHON_LIBRARIY - -打开vnpy_binding.sln编译或者在x64 Native Tools Command Prompt for VS 2017中运行以下代码· -```bat -msbuild vnpy_binding.sln +cd C:\vnpy +mkdir binding/build +cd binding/build +cmake -G "Visual Studio 15 2017 Win64" .. +msbuild vnpy_binding.sln /p:Configuration=Release /p:Platform=x64 ``` [Python]:https://www.python.org/ftp/python/3.7.2/python-3.7.2-amd64-webinstall.exe [CMake]:https://github.com/Kitware/CMake/releases/download/v3.13.3/cmake-3.13.3-win64-x64.msi -[VS2017]:https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community&rel=15# \ No newline at end of file +[VS2017]:https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community&rel=15# +[vnpy]:https://github.com/vnpy/vnpy/archive/v2.0-DEV.zip \ No newline at end of file