bump conan dependencies
This commit is contained in:
parent
8dbe79bcd2
commit
9b986f12e3
3
.github/workflows/build-cmake-conan.yml
vendored
3
.github/workflows/build-cmake-conan.yml
vendored
@ -30,9 +30,6 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
python -m pip install conan
|
python -m pip install conan
|
||||||
conan config init
|
conan config init
|
||||||
conan config set log.print_run_commands=True
|
|
||||||
conan config set general.revisions_enabled=1
|
|
||||||
conan remote add bincrafters https://bincrafters.jfrog.io/artifactory/api/conan/public-conan
|
|
||||||
- name: "Create host profile"
|
- name: "Create host profile"
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
[settings]
|
|
||||||
os=Playstation2
|
|
||||||
arch=mips
|
|
||||||
compiler=gcc
|
|
||||||
compiler.version=3.2
|
|
||||||
compiler.libcxx=libstdc++
|
|
||||||
build_type=Release
|
|
||||||
[options]
|
|
||||||
librw:platform=ps2
|
|
||||||
[build_requires]
|
|
||||||
ps2dev-ps2toolchain/unknown@madebr/testing
|
|
||||||
[env]
|
|
@ -53,13 +53,9 @@ class LibrwConan(ConanFile):
|
|||||||
def requirements(self):
|
def requirements(self):
|
||||||
if self.options.platform == "gl3":
|
if self.options.platform == "gl3":
|
||||||
if self.options.gl3_gfxlib == "glfw":
|
if self.options.gl3_gfxlib == "glfw":
|
||||||
self.requires("glfw/3.3.2")
|
self.requires("glfw/3.3.7")
|
||||||
elif self.options.gl3_gfxlib == "sdl2":
|
elif self.options.gl3_gfxlib == "sdl2":
|
||||||
self.requires("sdl2/2.0.12@bincrafters/stable")
|
self.requires("sdl/2.0.20")
|
||||||
elif self.options.platform == "ps2":
|
|
||||||
self.requires("ps2dev-ps2sdk/unknown@madebr/testing")
|
|
||||||
if self._os_is_playstation2:
|
|
||||||
self.requires("ps2dev-cmaketoolchain/{}".format(self.version))
|
|
||||||
|
|
||||||
def export_sources(self):
|
def export_sources(self):
|
||||||
for d in ("cmake", "skeleton", "src", "tools"):
|
for d in ("cmake", "skeleton", "src", "tools"):
|
||||||
|
Loading…
Reference in New Issue
Block a user