Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-10-06 09:07:19 +02:00
Code Issues Projects Releases Activity

conan: update qt, boost, ffmpeg, openal and sdl2

Browse Source
This commit is contained in:
Anonymous Maarten 2018-12-19 03:59:22 +01:00
parent bdf4167cd3
commit 5e582fd393
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/WrapTargets.cmake
View File

@ -24,7 +24,7 @@ endfunction()
function(rwdep_wrap_conan_targets) function(rwdep_wrap_conan_targets)
rwdep_wrap_conan_target(OpenAL::OpenAL openal) rwdep_wrap_conan_target(OpenAL::OpenAL openal)
rwdep_wrap_conan_target(bullet::bullet bullet) rwdep_wrap_conan_target(bullet::bullet bullet3)
rwdep_wrap_conan_target(glm::glm glm) rwdep_wrap_conan_target(glm::glm glm)
rwdep_wrap_conan_target(ffmpeg::ffmpeg ffmpeg) rwdep_wrap_conan_target(ffmpeg::ffmpeg ffmpeg)
rwdep_wrap_conan_target(SDL2::SDL2 sdl2) rwdep_wrap_conan_target(SDL2::SDL2 sdl2)

16
conanfile.py
View File

@ -19,7 +19,7 @@ class OpenrwConan(ConanFile):
'test_data=False', 'test_data=False',
'viewer=True', 'viewer=True',
'tools=True', 'tools=True',
'bullet:shared=False', 'bullet3:shared=False',
'sdl2:sdl2main=False', 'sdl2:sdl2main=False',
) )
@ -29,15 +29,15 @@ class OpenrwConan(ConanFile):
_rw_dependencies = { _rw_dependencies = {
'game': ( 'game': (
'openal/1.18.2@bincrafters/stable', 'openal/1.19.0@bincrafters/stable',
'bullet/2.87@bincrafters/stable', 'bullet3/2.87@bincrafters/stable',
'glm/0.9.9.1@g-truc/stable', 'glm/0.9.9.1@g-truc/stable',
'ffmpeg/4.0@bincrafters/stable', 'ffmpeg/4.0.2@bincrafters/stable',
'sdl2/2.0.8@bincrafters/stable', 'sdl2/2.0.9@bincrafters/stable',
'boost/1.67.0@conan/stable', 'boost/1.68.0@conan/stable',
), ),
'viewer': ( 'viewer': (
'Qt/5.11.1@bincrafters/stable', 'qt/5.12.0@bincrafters/stable',
), ),
'tools': ( 'tools': (
'freetype/2.9.0@bincrafters/stable', 'freetype/2.9.0@bincrafters/stable',
@ -46,7 +46,7 @@ class OpenrwConan(ConanFile):
def configure(self): def configure(self):
if self.options.viewer: if self.options.viewer:
self.options['Qt'].opengl = 'desktop' self.options['qt'].opengl = 'desktop'
def requirements(self): def requirements(self):
for dep in self._rw_dependencies['game']: for dep in self._rw_dependencies['game']: