Merge pull request #101 from madebr/conan-fix

Small pr to fix CI
This commit is contained in:
aap 2022-05-15 09:18:46 +02:00 committed by GitHub
commit b4be832434
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 21 deletions

View File

@ -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: |

View File

@ -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]

View File

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