matrixfurry.com / monado
The open source OpenXR runtime
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

xrt: Re-arrange build to avoid unnecessary includes.

Avoid unintentionally including cJSON from the source tree when using system,
etc. This adds granularity to the usage of "external" sources.

authored by

Ryan Pavlik and committed by
Jakob Bornecrantz 974c68de 47710e05

+131 -95
+1 -5
src/CMakeLists.txt
··· 1 1 # Copyright 2019-2020, Collabora, Ltd. 2 2 # SPDX-License-Identifier: BSL-1.0 3 3 4 - # "Link" against this interface target if your module 5 - # uses the files in "external". 6 - add_library(xrt-external-headers INTERFACE) 7 - target_include_directories(xrt-external-headers SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/external) 8 - 4 + add_subdirectory(external) 9 5 add_subdirectory(xrt)
+18
src/external/CMakeLists.txt
··· 1 + # Copyright 2020, Collabora, Ltd. 2 + # SPDX-License-Identifier: BSL-1.0 3 + 4 + add_library(xrt-external-openxr INTERFACE) 5 + target_include_directories(xrt-external-openxr INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/openxr_includes) 6 + 7 + add_library(xrt-external-glad INTERFACE) 8 + target_include_directories(xrt-external-glad INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/glad) 9 + 10 + if(BUILD_WITH_SYSTEM_CJSON) 11 + add_library(xrt-external-cjson ALIAS cJSON::cJSON) 12 + else() 13 + add_library(xrt-external-cjson INTERFACE) 14 + target_include_directories(xrt-external-cjson INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/cjson) 15 + endif() 16 + 17 + add_library(xrt-external-flexkalman INTERFACE) 18 + target_include_directories(xrt-external-flexkalman INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/flexkalman)
src/external/cjson/CHANGELOG.md src/external/cjson/cjson/CHANGELOG.md
src/external/cjson/CONTRIBUTORS.md src/external/cjson/cjson/CONTRIBUTORS.md
src/external/cjson/LICENSE src/external/cjson/cjson/LICENSE
src/external/cjson/cJSON.c src/external/cjson/cjson/cJSON.c
src/external/cjson/cJSON.h src/external/cjson/cjson/cJSON.h
src/external/flexkalman/AbsoluteOrientationMeasurement.h src/external/flexkalman/flexkalman/AbsoluteOrientationMeasurement.h
src/external/flexkalman/AbsolutePositionLeverArmMeasurement.h src/external/flexkalman/flexkalman/AbsolutePositionLeverArmMeasurement.h
src/external/flexkalman/AbsolutePositionMeasurement.h src/external/flexkalman/flexkalman/AbsolutePositionMeasurement.h
src/external/flexkalman/AngularVelocityMeasurement.h src/external/flexkalman/flexkalman/AngularVelocityMeasurement.h
src/external/flexkalman/AugmentedProcessModel.h src/external/flexkalman/flexkalman/AugmentedProcessModel.h
src/external/flexkalman/AugmentedState.h src/external/flexkalman/flexkalman/AugmentedState.h
src/external/flexkalman/BaseTypes.h src/external/flexkalman/flexkalman/BaseTypes.h
src/external/flexkalman/ConstantProcess.h src/external/flexkalman/flexkalman/ConstantProcess.h
src/external/flexkalman/EigenQuatExponentialMap.h src/external/flexkalman/flexkalman/EigenQuatExponentialMap.h
src/external/flexkalman/ExternalQuaternion.h src/external/flexkalman/flexkalman/ExternalQuaternion.h
src/external/flexkalman/FlexibleKalmanBase.h src/external/flexkalman/flexkalman/FlexibleKalmanBase.h
src/external/flexkalman/FlexibleKalmanCorrect.h src/external/flexkalman/flexkalman/FlexibleKalmanCorrect.h
src/external/flexkalman/FlexibleKalmanFilter.h src/external/flexkalman/flexkalman/FlexibleKalmanFilter.h
src/external/flexkalman/FlexibleKalmanMeta.h src/external/flexkalman/flexkalman/FlexibleKalmanMeta.h
src/external/flexkalman/FlexibleUnscentedCorrect.h src/external/flexkalman/flexkalman/FlexibleUnscentedCorrect.h
src/external/flexkalman/MatrixExponentialMap.h src/external/flexkalman/flexkalman/MatrixExponentialMap.h
src/external/flexkalman/OrientationConstantVelocity.h src/external/flexkalman/flexkalman/OrientationConstantVelocity.h
src/external/flexkalman/OrientationState.h src/external/flexkalman/flexkalman/OrientationState.h
src/external/flexkalman/PoseConstantVelocity.h src/external/flexkalman/flexkalman/PoseConstantVelocity.h
src/external/flexkalman/PoseConstantVelocityGeneric.h src/external/flexkalman/flexkalman/PoseConstantVelocityGeneric.h
src/external/flexkalman/PoseDampedConstantVelocity.h src/external/flexkalman/flexkalman/PoseDampedConstantVelocity.h
src/external/flexkalman/PoseSeparatelyDampedConstantVelocity.h src/external/flexkalman/flexkalman/PoseSeparatelyDampedConstantVelocity.h
src/external/flexkalman/PoseState.h src/external/flexkalman/flexkalman/PoseState.h
src/external/flexkalman/PoseStateExponentialMap.h src/external/flexkalman/flexkalman/PoseStateExponentialMap.h
src/external/flexkalman/PureVectorState.h src/external/flexkalman/flexkalman/PureVectorState.h
src/external/flexkalman/README.md src/external/flexkalman/flexkalman/README.md
src/external/flexkalman/SO3.h src/external/flexkalman/flexkalman/SO3.h
src/external/flexkalman/SigmaPointGenerator.h src/external/flexkalman/flexkalman/SigmaPointGenerator.h
src/external/glad/gl.c src/external/glad/glad/gl.c
src/external/glad/gl.h src/external/glad/glad/gl.h
src/external/imgui/LICENSE.cimgui.txt src/external/imgui/imgui/LICENSE.cimgui.txt
src/external/imgui/LICENSE.imgui.txt src/external/imgui/imgui/LICENSE.imgui.txt
src/external/imgui/cimgui.cpp src/external/imgui/imgui/cimgui.cpp
src/external/imgui/cimgui.h src/external/imgui/imgui/cimgui.h
+2 -2
src/external/imgui/cimgui_sdl.cpp src/external/imgui/imgui/cimgui_sdl.cpp
··· 1 - #include "./imgui/imgui.h" 1 + #include "imgui.h" 2 2 #include "cimgui.h" 3 3 4 - #include "./imgui/imgui_internal.h" 4 + #include "imgui_internal.h" 5 5 6 6 #include "imgui_impl_sdl.h" 7 7
src/external/imgui/imconfig.h src/external/imgui/imgui/imconfig.h
src/external/imgui/imgui.cpp src/external/imgui/imgui/imgui.cpp
src/external/imgui/imgui.h src/external/imgui/imgui/imgui.h
src/external/imgui/imgui_demo.cpp src/external/imgui/imgui/imgui_demo.cpp
src/external/imgui/imgui_draw.cpp src/external/imgui/imgui/imgui_draw.cpp
src/external/imgui/imgui_impl_opengl3.cpp src/external/imgui/imgui/imgui_impl_opengl3.cpp
src/external/imgui/imgui_impl_opengl3.h src/external/imgui/imgui/imgui_impl_opengl3.h
src/external/imgui/imgui_impl_sdl.cpp src/external/imgui/imgui/imgui_impl_sdl.cpp
src/external/imgui/imgui_impl_sdl.h src/external/imgui/imgui/imgui_impl_sdl.h
src/external/imgui/imgui_internal.h src/external/imgui/imgui/imgui_internal.h
src/external/imgui/imgui_widgets.cpp src/external/imgui/imgui/imgui_widgets.cpp
src/external/imgui/imstb_rectpack.h src/external/imgui/imgui/imstb_rectpack.h
src/external/imgui/imstb_textedit.h src/external/imgui/imgui/imstb_textedit.h
src/external/imgui/imstb_truetype.h src/external/imgui/imgui/imstb_truetype.h
src/external/imgui_monado/cimgui_monado.h src/external/imgui/imgui_monado/cimgui_monado.h
src/external/imgui_monado/imgui_monado.cpp src/external/imgui/imgui_monado/imgui_monado.cpp
+8 -1
src/external/meson.build
··· 1 - external_include = include_directories('.') 1 + # Copyright 2019-2020, Collabora, Ltd. 2 + # SPDX-License-Identifier: BSL-1.0 3 + 4 + openxr_include = include_directories('openxr_includes') 5 + cjson_include = include_directories('cjson') 6 + flexkalman_include = include_directories('flexkalman') 7 + glad_include = include_directories('glad') 8 + imgui_include = include_directories('imgui')
+1 -1
src/external/openxr_includes/loader_interfaces.h src/external/openxr_includes/openxr/loader_interfaces.h
··· 19 19 20 20 #pragma once 21 21 22 - #include <openxr_includes/openxr.h> 22 + #include "openxr.h" 23 23 24 24 #ifdef __cplusplus 25 25 extern "C" {
src/external/openxr_includes/openxr.h src/external/openxr_includes/openxr/openxr.h
src/external/openxr_includes/openxr_platform.h src/external/openxr_includes/openxr/openxr_platform.h
src/external/openxr_includes/openxr_platform_defines.h src/external/openxr_includes/openxr/openxr_platform_defines.h
src/external/openxr_includes/openxr_reflection.h src/external/openxr_includes/openxr/openxr_reflection.h
+10 -7
src/xrt/auxiliary/CMakeLists.txt
··· 112 112 target_include_directories(aux-includes INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) 113 113 target_link_libraries(aux-includes INTERFACE xrt-interfaces) 114 114 115 - # OpenGL library. 116 - add_library(aux_ogl STATIC ${OGL_SOURCE_FILES}) 117 - target_link_libraries(aux_ogl PUBLIC aux-includes) 118 - # for GLAD 119 - target_link_libraries(aux_ogl PRIVATE xrt-external-headers) 115 + if(BUILD_WITH_OPENGL) 116 + # OpenGL library. 117 + add_library(aux_ogl STATIC ${OGL_SOURCE_FILES}) 118 + target_link_libraries(aux_ogl PUBLIC aux-includes) 119 + # for GLAD 120 + target_link_libraries(aux_ogl PUBLIC xrt-external-glad) 121 + endif() 120 122 121 123 # OS library. 122 124 add_library(aux_os STATIC ${OS_SOURCE_FILES}) ··· 141 143 # Util library. 142 144 add_library(aux_util STATIC ${UTIL_SOURCE_FILES}) 143 145 target_link_libraries(aux_util PUBLIC aux-includes) 144 - target_link_libraries(aux_util PUBLIC xrt-external-headers) 145 146 # for u_device 146 147 target_link_libraries(aux_util PUBLIC aux_math) 147 148 if(BUILD_WITH_JPEG) ··· 151 152 if(BUILD_WITH_SYSTEM_CJSON) 152 153 target_link_libraries(aux_util PUBLIC cJSON::cJSON) 153 154 target_compile_definitions(aux_util PRIVATE XRT_USE_SYSTEM_CJSON) 155 + else() 156 + target_link_libraries(aux_util PUBLIC xrt-external-cjson) 154 157 endif() 155 158 156 159 # Tracking library. ··· 163 166 ${EIGEN3_INCLUDE_DIR} 164 167 ) 165 168 # for flexkalman 166 - target_link_libraries(aux_tracking PRIVATE xrt-external-headers) 169 + target_link_libraries(aux_tracking PRIVATE xrt-external-flexkalman) 167 170 if(BUILD_TRACKING) 168 171 target_include_directories(aux_tracking SYSTEM 169 172 PRIVATE
+3 -4
src/xrt/auxiliary/meson.build
··· 42 42 ), 43 43 include_directories: [ 44 44 xrt_include, 45 - external_include, 45 + cjson_include, 46 46 ], 47 47 dependencies: [ 48 48 xrt_config_have ··· 63 63 ), 64 64 include_directories: [ 65 65 xrt_include, 66 - external_include, 66 + glad_include, 67 67 ], 68 68 ) 69 69 ··· 150 150 lib_aux_tracking = static_library( 151 151 'aux_tracking', 152 152 files(tracking_srcs), 153 - include_directories: [xrt_include, external_include], 153 + include_directories: [xrt_include, flexkalman_include], 154 154 dependencies: tracking_deps 155 155 ) 156 156 ··· 168 168 ), 169 169 include_directories: [ 170 170 xrt_include, 171 - external_include, 172 171 ], 173 172 ) 174 173
+3 -4
src/xrt/compositor/meson.build
··· 7 7 8 8 # TODO: Dependency resolution and subsequent configuration could be improved 9 9 compositor_deps = [aux, shaders, vulkan, xrt_config_vulkan] 10 + compositor_includes = [xrt_include] 10 11 11 12 compositor_srcs = [ 12 13 'client/comp_vk_client.c', ··· 49 50 'client/comp_gles_glue.c', 50 51 ] 51 52 compositor_deps += [opengl] 53 + compositor_includes += [glad_include] 52 54 endif 53 55 54 56 if build_opengl and build_xlib ··· 114 116 lib_comp = static_library( 115 117 'comp', 116 118 compositor_srcs, 117 - include_directories: [ 118 - xrt_include, 119 - external_include, 120 - ], 119 + include_directories: compositor_includes, 121 120 dependencies: compositor_deps, 122 121 c_args: compile_args, 123 122 cpp_args: compile_args,
+2 -2
src/xrt/drivers/CMakeLists.txt
··· 80 80 ) 81 81 82 82 add_library(drv_ns STATIC ${NS_SOURCE_FILES}) 83 - target_link_libraries(drv_ns PRIVATE xrt-interfaces aux_math xrt-external-headers) 83 + target_link_libraries(drv_ns PRIVATE xrt-interfaces aux_math xrt-external-cjson) 84 84 list(APPEND ENABLED_HEADSET_DRIVERS ns) 85 85 endif() 86 86 ··· 146 146 ) 147 147 148 148 add_library(drv_vive STATIC ${VIVE_SOURCE_FILES}) 149 - target_link_libraries(drv_vive PRIVATE xrt-interfaces aux_os aux_util aux_math) 149 + target_link_libraries(drv_vive PRIVATE xrt-interfaces aux_os aux_util aux_math xrt-external-cjson) 150 150 target_link_libraries(drv_vive PRIVATE ${ZLIB_LIBRARIES}) 151 151 target_include_directories(drv_vive PRIVATE ${ZLIB_INCLUDE_DIRS}) 152 152 list(APPEND ENABLED_HEADSET_DRIVERS vive)
+8 -2
src/xrt/drivers/meson.build
··· 50 50 'north_star/ns_interface.h', 51 51 'north_star/ns_prober.c', 52 52 ), 53 - include_directories: [xrt_include, external_include], 53 + include_directories: [ 54 + xrt_include, 55 + cjson_include, 56 + ], 54 57 dependencies: [aux, xrt_config_drivers], 55 58 build_by_default: 'ns' in drivers, 56 59 ) ··· 126 129 'vive/vive_controller_driver.c', 127 130 'vive/vive_controller_interface.h' 128 131 ), 129 - include_directories: [xrt_include, external_include], 132 + include_directories: [ 133 + xrt_include, 134 + cjson_include, 135 + ], 130 136 dependencies: [aux, zlib], 131 137 build_by_default: 'vive' in drivers, 132 138 )
+3 -3
src/xrt/include/xrt/xrt_openxr_includes.h
··· 33 33 #include <time.h> 34 34 #endif 35 35 36 - #include "openxr_includes/openxr.h" 37 - #include "openxr_includes/openxr_platform.h" 38 - #include "openxr_includes/loader_interfaces.h" 36 + #include "openxr/openxr.h" 37 + #include "openxr/openxr_platform.h" 38 + #include "openxr/loader_interfaces.h"
+3 -1
src/xrt/state_trackers/CMakeLists.txt
··· 1 1 # Copyright 2019, Collabora, Ltd. 2 2 # SPDX-License-Identifier: BSL-1.0 3 3 4 - add_subdirectory(gui) 4 + if(BUILD_WITH_OPENGL) 5 + add_subdirectory(gui) 6 + endif() 5 7 add_subdirectory(oxr) 6 8 add_subdirectory(prober)
+25 -22
src/xrt/state_trackers/gui/CMakeLists.txt
··· 11 11 gui_scene_debug.c 12 12 gui_scene_main_menu.c 13 13 gui_scene_video.c 14 - ../../../external/imgui/cimgui.cpp 15 - ../../../external/imgui_monado/imgui_monado.cpp 16 - ../../../external/imgui/cimgui.h 17 - ../../../external/imgui/imconfig.h 18 - ../../../external/imgui/imgui.cpp 19 - ../../../external/imgui/imgui.h 20 - ../../../external/imgui/imgui_demo.cpp 21 - ../../../external/imgui/imgui_draw.cpp 22 - ../../../external/imgui/imgui_impl_opengl3.cpp 23 - ../../../external/imgui/imgui_impl_opengl3.h 24 - ../../../external/imgui/imgui_internal.h 25 - ../../../external/imgui/imgui_widgets.cpp 26 - ../../../external/imgui/imstb_rectpack.h 27 - ../../../external/imgui/imstb_textedit.h 28 - ../../../external/imgui/imstb_truetype.h 14 + ../../../external/imgui/imgui/cimgui.cpp 15 + ../../../external/imgui/imgui_monado/imgui_monado.cpp 16 + ../../../external/imgui/imgui/cimgui.h 17 + ../../../external/imgui/imgui/imconfig.h 18 + ../../../external/imgui/imgui/imgui.cpp 19 + ../../../external/imgui/imgui/imgui.h 20 + ../../../external/imgui/imgui/imgui_demo.cpp 21 + ../../../external/imgui/imgui/imgui_draw.cpp 22 + ../../../external/imgui/imgui/imgui_impl_opengl3.cpp 23 + ../../../external/imgui/imgui/imgui_impl_opengl3.h 24 + ../../../external/imgui/imgui/imgui_internal.h 25 + ../../../external/imgui/imgui/imgui_widgets.cpp 26 + ../../../external/imgui/imgui/imstb_rectpack.h 27 + ../../../external/imgui/imgui/imstb_textedit.h 28 + ../../../external/imgui/imgui/imstb_truetype.h 29 29 ) 30 30 31 31 add_library(st_gui STATIC ··· 33 33 ) 34 34 35 35 target_link_libraries(st_gui PRIVATE 36 - xrt-external-headers 36 + xrt-external-glad 37 37 aux_util 38 38 ) 39 39 target_include_directories(st_gui PUBLIC 40 40 ${CMAKE_CURRENT_SOURCE_DIR}/.. 41 + ${CMAKE_CURRENT_SOURCE_DIR}/../../../external/imgui 41 42 ) 42 43 43 44 if(BUILD_WITH_SDL2) 44 - add_library(imgui_impl_sdl STATIC 45 - ../../../external/imgui/cimgui_sdl.cpp 46 - ../../../external/imgui/imgui_impl_sdl.cpp 47 - ../../../external/imgui/imgui_impl_sdl.h 45 + add_library(imgui_impl_sdl STATIC 46 + ../../../external/imgui/imgui/cimgui_sdl.cpp 47 + ../../../external/imgui/imgui/imgui_impl_sdl.cpp 48 + ../../../external/imgui/imgui/imgui_impl_sdl.h 48 49 ) 49 50 target_link_libraries(imgui_impl_sdl PRIVATE 50 51 ${SDL2_LIBRARIES} 51 - xrt-external-headers 52 52 ) 53 - target_include_directories(imgui_impl_sdl PRIVATE 53 + target_include_directories(imgui_impl_sdl 54 + PRIVATE 54 55 ${SDL2_INCLUDE_DIRS} 56 + PUBLIC 57 + ${CMAKE_CURRENT_SOURCE_DIR}/../../../external/imgui 55 58 ) 56 59 endif()
+20 -18
src/xrt/state_trackers/gui/meson.build
··· 1 - # Copyright 2019, Collabora, Ltd. 1 + # Copyright 2019-2020, Collabora, Ltd. 2 2 # SPDX-License-Identifier: BSL-1.0 3 3 4 4 gui_sources = [ ··· 11 11 'gui_scene_debug.c', 12 12 'gui_scene_main_menu.c', 13 13 'gui_scene_video.c', 14 - '../../../external/imgui/cimgui.cpp', 15 - '../../../external/imgui/cimgui.h', 16 - '../../../external/imgui/imconfig.h', 17 - '../../../external/imgui/imgui.cpp', 18 - '../../../external/imgui/imgui.h', 19 - '../../../external/imgui/imgui_demo.cpp', 20 - '../../../external/imgui/imgui_draw.cpp', 21 - '../../../external/imgui/imgui_impl_opengl3.cpp', 22 - '../../../external/imgui/imgui_impl_opengl3.h', 23 - '../../../external/imgui/imgui_internal.h', 24 - '../../../external/imgui/imgui_widgets.cpp', 25 - '../../../external/imgui/imstb_rectpack.h', 26 - '../../../external/imgui/imstb_textedit.h', 27 - '../../../external/imgui/imstb_truetype.h', 28 - '../../../external/imgui_monado/cimgui_monado.h', 29 - '../../../external/imgui_monado/imgui_monado.cpp' 14 + '../../../external/imgui/imgui/cimgui.cpp', 15 + '../../../external/imgui/imgui/cimgui.h', 16 + '../../../external/imgui/imgui/imconfig.h', 17 + '../../../external/imgui/imgui/imgui.cpp', 18 + '../../../external/imgui/imgui/imgui.h', 19 + '../../../external/imgui/imgui/imgui_demo.cpp', 20 + '../../../external/imgui/imgui/imgui_draw.cpp', 21 + '../../../external/imgui/imgui/imgui_impl_opengl3.cpp', 22 + '../../../external/imgui/imgui/imgui_impl_opengl3.h', 23 + '../../../external/imgui/imgui/imgui_internal.h', 24 + '../../../external/imgui/imgui/imgui_widgets.cpp', 25 + '../../../external/imgui/imgui/imstb_rectpack.h', 26 + '../../../external/imgui/imgui/imstb_textedit.h', 27 + '../../../external/imgui/imgui/imstb_truetype.h', 28 + '../../../external/imgui/imgui_monado/cimgui_monado.h', 29 + '../../../external/imgui/imgui_monado/imgui_monado.cpp' 30 30 ] 31 31 32 32 gui_deps = [aux, xrt_config_have] ··· 36 36 files(gui_sources), 37 37 include_directories: [ 38 38 xrt_include, 39 - external_include, 39 + glad_include, 40 + cjson_include, 41 + imgui_include, 40 42 ], 41 43 dependencies: gui_deps, 42 44 )
+1 -1
src/xrt/state_trackers/oxr/CMakeLists.txt
··· 52 52 endif() 53 53 54 54 add_library(st_oxr STATIC ${OXR_SOURCE_FILES}) 55 - target_link_libraries(st_oxr PRIVATE xrt-interfaces aux_util aux_math Vulkan::Vulkan comp_client) 55 + target_link_libraries(st_oxr PRIVATE xrt-interfaces xrt-external-openxr aux_util aux_math Vulkan::Vulkan comp_client)
+2 -2
src/xrt/state_trackers/oxr/meson.build
··· 1 - # Copyright 2019, Collabora, Ltd. 1 + # Copyright 2019-2020, Collabora, Ltd. 2 2 # SPDX-License-Identifier: BSL-1.0 3 3 4 4 compile_args = [] ··· 53 53 ), 54 54 include_directories: [ 55 55 xrt_include, 56 - external_include, 56 + openxr_include, 57 57 ], 58 58 dependencies: [aux, vulkan], 59 59 c_args: compile_args,
+2 -2
src/xrt/state_trackers/oxr/oxr_api_instance.c
··· 24 24 #include "oxr_api_verify.h" 25 25 #include "oxr_extension_support.h" 26 26 27 - #include "openxr_includes/openxr.h" 28 - #include "openxr_includes/openxr_reflection.h" 27 + #include "openxr/openxr.h" 28 + #include "openxr/openxr_reflection.h" 29 29 30 30 #define MAKE_EXTENSION_PROPERTIES(mixed_case, all_caps) \ 31 31 {XR_TYPE_EXTENSION_PROPERTIES, NULL, XR_##all_caps##_EXTENSION_NAME, \
+1 -1
src/xrt/state_trackers/oxr/oxr_logger.c
··· 17 17 #include "oxr_objects.h" 18 18 #include "oxr_logger.h" 19 19 20 - #include "openxr_includes/openxr_reflection.h" 20 + #include "openxr/openxr_reflection.h" 21 21 22 22 23 23 DEBUG_GET_ONCE_BOOL_OPTION(entrypoints, "OXR_DEBUG_ENTRYPOINTS", false)
+2 -2
src/xrt/state_trackers/prober/meson.build
··· 1 - # Copyright 2019, Collabora, Ltd. 1 + # Copyright 2019-2020, Collabora, Ltd. 2 2 # SPDX-License-Identifier: BSL-1.0 3 3 4 4 prober_sources = [ ··· 37 37 include_directories: [ 38 38 xrt_include, 39 39 drv_include, 40 - external_include, 40 + cjson_include, 41 41 ], 42 42 dependencies: prober_deps, 43 43 )
+6 -5
src/xrt/targets/gui/meson.build
··· 1 - # Copyright 2019, Collabora, Ltd. 1 + # Copyright 2019-2020, Collabora, Ltd. 2 2 # SPDX-License-Identifier: BSL-1.0 3 3 4 4 gui_deps = [ ··· 20 20 'gui_sdl2_imgui.c', 21 21 'gui_sdl2_main.c', 22 22 'gui_sdl2_prober.c', 23 - '../../../external/imgui/cimgui_sdl.cpp', 24 - '../../../external/imgui/imgui_impl_sdl.cpp', 25 - '../../../external/imgui/imgui_impl_sdl.h', 23 + '../../../external/imgui/imgui/cimgui_sdl.cpp', 24 + '../../../external/imgui/imgui/imgui_impl_sdl.cpp', 25 + '../../../external/imgui/imgui/imgui_impl_sdl.h', 26 26 ), 27 27 link_whole: [ 28 28 lib_aux_os, ··· 36 36 include_directories: [ 37 37 aux_include, 38 38 common_include, 39 - external_include, 39 + glad_include, 40 40 st_include, 41 41 drv_include, 42 42 xrt_include, 43 + imgui_include, 43 44 ], 44 45 dependencies: gui_deps + driver_deps, 45 46 )
+10 -10
src/xrt/targets/openxr/meson.build
··· 1 - # Copyright 2019, Collabora, Ltd. 1 + # Copyright 2019-2020, Collabora, Ltd. 2 2 # SPDX-License-Identifier: BSL-1.0 3 3 4 4 ###### ··· 17 17 xr_api_major = 1 18 18 19 19 hack_deps = [] 20 - hack_src = [] 20 + hack_src = [ 'oxr_sdl2_hack.c'] 21 21 hack_libs = [] 22 - hack_incs = [] 22 + hack_incs = [ 23 + glad_include, 24 + imgui_include, 25 + ] 23 26 24 27 if sdl2.found() 25 28 hack_deps += sdl2 26 29 hack_src += [ 27 - 'oxr_sdl2_hack.c', 28 - '../../../external/imgui/cimgui_sdl.cpp', 29 - '../../../external/imgui/imgui_impl_sdl.cpp', 30 - '../../../external/imgui/imgui_impl_sdl.h', 30 + '../../../external/imgui/imgui/cimgui_sdl.cpp', 31 + '../../../external/imgui/imgui/imgui_impl_sdl.cpp', 32 + '../../../external/imgui/imgui/imgui_impl_sdl.h', 31 33 ] 32 34 hack_libs += lib_st_gui 33 35 hack_incs += [ 34 36 st_include, 35 37 ] 36 - else 37 - hack_src += 'oxr_sdl2_hack.c' 38 38 endif 39 39 40 40 openxr_deps = [ ··· 84 84 lib_target_instance, 85 85 ] + driver_libs + hack_libs, 86 86 include_directories: [ 87 - external_include, 87 + openxr_include, 88 88 st_include, # Sigh debian meson requires this. 89 89 aux_include, 90 90 common_include,