Windows build with Conan

This commit is contained in:
Alexander Popov 2022-09-14 00:34:25 +03:00
parent 986b8d62a7
commit 060c13a068
4 changed files with 30 additions and 8 deletions

View File

@ -8,6 +8,7 @@
> This project use Semantic Versioning 2.0.0 https://semver.org/ > 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` - ✔️ - Fixed bad returned value of `assets_version`
- ♻️ - Changed the letter argument of the program to return version information from `s` to `i` - ♻️ - Changed the letter argument of the program to return version information from `s` to `i`

View File

@ -9,11 +9,18 @@ libraries list for specified operation system.
**How to build from source:** **How to build from source:**
**Linux:**
```sh ```sh
conan install . conan install .
make make
``` ```
**Windows:**
```sh
conan install .
conan build .
```
**How to use:** **How to use:**
``` ```
@ -50,11 +57,18 @@ wget https://piston-meta.mojang.com/v1/packages/68cded4616fba9fbefb3f895033c2611
**Как скомпилировать:** **Как скомпилировать:**
**Linux:**
```sh ```sh
conan install . conan install .
make make
``` ```
**Windows:**
```sh
conan install .
conan build .
```
**Как использовать:** **Как использовать:**
``` ```

14
conanfile.py Normal file
View File

@ -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")

View File

@ -25,18 +25,11 @@
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Link>
<AdditionalLibraryDirectories>.\</AdditionalLibraryDirectories>
<AdditionalDependencies>cjson.lib</AdditionalDependencies>
</Link>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ItemGroup>
<ClInclude Include="cjson/cjson.h" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="make-libs-list.c" /> <ClCompile Include="make-libs-list.c" />
</ItemGroup> </ItemGroup>