Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-10-04 16:17:17 +02:00
Code Issues Projects Releases Activity

Merge pull request #722 from danhedron/fix-conan

Browse Source 
Fix conan build
This commit is contained in:
Daniel Evans 2019-09-01 22:23:08 +01:00 committed by GitHub
commit 51b7264744
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conanfile.py
View File

@ -35,6 +35,7 @@ class OpenrwConan(ConanFile):
'ffmpeg/4.0.2@bincrafters/stable', 'ffmpeg/4.0.2@bincrafters/stable',
'sdl2/2.0.9@bincrafters/stable', 'sdl2/2.0.9@bincrafters/stable',
'boost/1.68.0@conan/stable', 'boost/1.68.0@conan/stable',
'bzip2/1.0.8@conan/stable',
), ),
'viewer': ( 'viewer': (
'qt/5.12.0@bincrafters/stable', 'qt/5.12.0@bincrafters/stable',

1
scripts/docker/docker_tool.py
View File

@ -32,6 +32,7 @@ def create(ns: argparse.Namespace):
env_args = [a for e in ns.env for a in ('-e', e)] env_args = [a for e in ns.env for a in ('-e', e)]
env_args += ['-e', 'DOCKER=TRUE', ] env_args += ['-e', 'DOCKER=TRUE', ]
run_args = ['docker', 'run', run_args = ['docker', 'run',
'--cap-add', 'SYS_PTRACE',
'-v', '{}:/src:rw,z'.format(str(openrw_dir)), '-v', '{}:/src:rw,z'.format(str(openrw_dir)),
'-v', '{}:/build:rw,z'.format(str(build_dir)) ] + \ '-v', '{}:/build:rw,z'.format(str(build_dir)) ] + \
env_args + ['--name', ns.name, '-d', ns.tag, 'sleep', 'infinity'] env_args + ['--name', ns.name, '-d', ns.tag, 'sleep', 'infinity']