Skip to content

Commit

Permalink
Use the declared OpenHMD dep
Browse files Browse the repository at this point in the history
Don't directly pull in the openhmd lib from the subproject. Instead,
use the dependency object it provides, so we get any provided
compiler and link flags from it automatically.
  • Loading branch information
thaytan committed Sep 18, 2021
1 parent 0e2f0b8 commit 087aa4c
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,19 @@ sources = [
'driver_openhmd.cpp'
]

includes = include_directories(['./subprojects/openhmd/include', './subprojects/openvr'])
includes = include_directories(['./subprojects/openvr'])

openhmd_subproject = subproject('openhmd', default_options: ['default_library=static'])
openhmd_lib = openhmd_subproject.get_variable('openhmd_lib')

deps = [
dependency('threads')
dependency('threads'),
dependency('openhmd', fallback : ['openhmd', 'openhmd_dep'])
]

steamvr_openhmd_lib = library(
'driver_openhmd', sources,
include_directories : includes,
dependencies : deps,
link_with: openhmd_lib,
install : true,
version : meson.project_version(),
name_prefix : ''
Expand Down

0 comments on commit 087aa4c

Please sign in to comment.