Commit: ad4f9a4d98eef6986b1b86d0c71f396c06d37930
Author: Julian Eisel
Date: Tue Aug 20 09:17:56 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rBad4f9a4d98eef6986b1b86d0c71f396c06d37930
Fix compiling with WITH_OPENXR disabled
===================================================================
M intern/ghost/intern/GHOST_C-api.cpp
M source/blender/windowmanager/CMakeLists.txt
===================================================================
diff --git a/intern/ghost/intern/GHOST_C-api.cpp
b/intern/ghost/intern/GHOST_C-api.cpp
index a5d22f26a22..778daf83d32 100644
--- a/intern/ghost/intern/GHOST_C-api.cpp
+++ b/intern/ghost/intern/GHOST_C-api.cpp
@@ -30,7 +30,9 @@
#include "GHOST_ISystem.h"
#include "GHOST_IEvent.h"
#include "GHOST_IEventConsumer.h"
-#include "GHOST_IXrContext.h"
+#ifdef WITH_OPENXR
+# include "GHOST_IXrContext.h"
+#endif
#include "intern/GHOST_CallbackEventConsumer.h"
#include "intern/GHOST_XrException.h"
diff --git a/source/blender/windowmanager/CMakeLists.txt
b/source/blender/windowmanager/CMakeLists.txt
index 866ec1c9d8a..39d226ac5fa 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -78,7 +78,6 @@ set(SRC
intern/wm_uilist_type.c
intern/wm_utils.c
intern/wm_window.c
- intern/wm_xr.c
gizmo/intern/wm_gizmo.c
gizmo/intern/wm_gizmo_group.c
gizmo/intern/wm_gizmo_group_type.c
@@ -180,6 +179,9 @@ endif()
if(WITH_OPENXR)
add_definitions(-DWITH_OPENXR)
+ list(APPEND SRC
+ intern/wm_xr.c
+ )
endif()
blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}"
"${LIB}")
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
