From 060c13a0681cab5086728a2d1a9dacbbafc97f76 Mon Sep 17 00:00:00 2001 From: Alexander Popov Date: Wed, 14 Sep 2022 00:34:25 +0300 Subject: [PATCH] Windows build with Conan --- HISTORY.md | 3 ++- README.md | 14 ++++++++++++++ conanfile.py | 14 ++++++++++++++ make-libs-list.vcxproj | 7 ------- 4 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 conanfile.py diff --git a/HISTORY.md b/HISTORY.md index f69cb17..1a05fbe 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -8,6 +8,7 @@ > This project use Semantic Versioning 2.0.0 https://semver.org/ -## 13/09/2022 - (1.0.1) +## 14/09/2022 - (1.0.1) +- ➕ - Added [Conan](https://conan.io/) for Windows - ✔️ - Fixed bad returned value of `assets_version` - ♻️ - Changed the letter argument of the program to return version information from `s` to `i` diff --git a/README.md b/README.md index 299a000..2e964ff 100644 --- a/README.md +++ b/README.md @@ -9,11 +9,18 @@ libraries list for specified operation system. **How to build from source:** +**Linux:** ```sh conan install . make ``` +**Windows:** +```sh +conan install . +conan build . +``` + **How to use:** ``` @@ -50,11 +57,18 @@ wget https://piston-meta.mojang.com/v1/packages/68cded4616fba9fbefb3f895033c2611 **Как скомпилировать:** +**Linux:** ```sh conan install . make ``` +**Windows:** +```sh +conan install . +conan build . +``` + **Как использовать:** ``` diff --git a/conanfile.py b/conanfile.py new file mode 100644 index 0000000..4a58f73 --- /dev/null +++ b/conanfile.py @@ -0,0 +1,14 @@ +from conans import ConanFile, MSBuild + +class ExampleConan(ConanFile): + name = "make-libs-list" + version = "1.0.1" + settings = "os", "arch", "build_type", "compiler" + options = {"shared": [True, False], "st": [True, False]} + default_options = {"shared": False, "st": False} + exports = "*" + _msvc_archs = {"x86": "x86", "x86_64": "x64"} + + def build(self): + msbuild = MSBuild(self) + msbuild.build("make-libs-list.vcxproj") diff --git a/make-libs-list.vcxproj b/make-libs-list.vcxproj index d2cd852..13406e6 100644 --- a/make-libs-list.vcxproj +++ b/make-libs-list.vcxproj @@ -25,18 +25,11 @@ - - .\ - cjson.lib - .\;%(AdditionalIncludeDirectories) - - -