build: Enable service less build with meson too

meson_options.txt

@@ -61,3 +61,9 @@ option('wayland',
 	type: 'feature',
 	value: 'auto',
 	description: 'Enable support for Wayland rendering.')
+
+option('service',
+	type: 'boolean',
+	value: true,
+	description: 'Enable separate service module for OpenXR runtime'
+)

src/xrt/include/xrt/meson.build

@@ -75,7 +75,7 @@ xrt_config_have = declare_dependency(
 #
 
 build_conf = configuration_data()
-if true
+if get_option('service')
 	build_conf.set('XRT_FEATURE_SERVICE', true)
 endif
 

src/xrt/meson.build

@@ -8,5 +8,7 @@ subdir('auxiliary')
 subdir('drivers')
 subdir('compositor')
 subdir('state_trackers')
+if get_option('service')
 	subdir('ipc')
+endif
 subdir('targets')

src/xrt/targets/meson.build

@@ -66,4 +66,7 @@ if get_option('gui').enabled() or (get_option('gui').auto() and sdl2.found())
 	subdir('gui')
 endif
 
+if get_option('service')
 	subdir('service')
+endif
+

src/xrt/targets/openxr/meson.build

@@ -63,6 +63,25 @@ if build_xcb_xrandr_direct
 	openxr_deps += [xcb_randr]
 endif
 
+libs = [
+	lib_aux_vk,
+	lib_aux_os,
+	lib_aux_ogl,
+	lib_aux_util,
+	lib_aux_math,
+	lib_comp,
+	lib_st_oxr
+] + hack_libs
+
+if get_option('service')
+	libs += lib_ipc_client
+else
+	libs += [
+		lib_target_instance,
+		driver_libs
+	]
+endif
+
 mapfile = 'libopenxr.version'
 version_script_flag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile)
 openxr = library(
@@ -71,16 +90,7 @@ openxr = library(
 		'target.c',
 		hack_src,
 	),
-	link_whole: [
+	link_whole: libs,
-		lib_aux_vk,
-		lib_aux_os,
-		lib_aux_ogl,
-		lib_aux_util,
-		lib_aux_math,
-		lib_comp,
-		lib_ipc_client,
-		lib_st_oxr,
-	] + hack_libs,
 	include_directories: [
 		openxr_include,
 		st_include, # Sigh debian meson requires this.