[Bf-blender-cvs] [8f6b3d27d0d] soc-2019-openxr: Remove files to sync with latest changes in patches
Julian Eisel
noreply at git.blender.org
Tue Nov 19 15:34:37 CET 2019
Commit: 8f6b3d27d0db35f0316578b047b29820b8abbc4c
Author: Julian Eisel
Date: Tue Nov 19 15:33:30 2019 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rB8f6b3d27d0db35f0316578b047b29820b8abbc4c
Remove files to sync with latest changes in patches
===================================================================
D build_files/build_environment/patches/openxr_sdk.diff
D build_files/cmake/Modules/presentation.cmake
D build_files/cmake/Modules/xr_platform_defines.cmake
===================================================================
diff --git a/build_files/build_environment/patches/openxr_sdk.diff b/build_files/build_environment/patches/openxr_sdk.diff
deleted file mode 100644
index 4239fba4f16..00000000000
--- a/build_files/build_environment/patches/openxr_sdk.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur orig/src/loader/CMakeLists.txt external_openxr_sdk/src/loader/CMakeLists.txt
---- orig/src/loader/CMakeLists.txt 2019-07-29 07:06:59 -0600
-+++ external_openxr_sdk/src/loader/CMakeLists.txt 2019-08-20 07:56:51 -0600
-@@ -128,24 +128,6 @@
- configure_file("openxr.pc.in" "openxr.pc" @ONLY)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/openxr.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
- elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-- foreach(configuration in CMAKE_C_FLAGS_DEBUG
-- CMAKE_C_FLAGS_RELEASE
-- CMAKE_C_FLAGS_RELWITHDEBINFO
-- CMAKE_CXX_FLAGS_DEBUG
-- CMAKE_CXX_FLAGS_RELEASE
-- CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-- # If building DLLs, force static CRT linkage
-- if(DYNAMIC_LOADER)
-- if (${configuration} MATCHES "/MD")
-- string(REGEX REPLACE "/MD" "/MT" ${configuration} "${${configuration}}")
-- endif()
-- else() # Otherwise for static libs, link the CRT dynamically
-- if (${configuration} MATCHES "/MT")
-- string(REGEX REPLACE "/MT" "/MD" ${configuration} "${${configuration}}")
-- endif()
-- endif()
-- endforeach()
--
- target_link_libraries(${LOADER_NAME} shlwapi)
- target_compile_options(${LOADER_NAME} PRIVATE)
- generate_export_header(${LOADER_NAME})
diff --git a/build_files/cmake/Modules/presentation.cmake b/build_files/cmake/Modules/presentation.cmake
deleted file mode 100644
index 5d0b544422e..00000000000
--- a/build_files/cmake/Modules/presentation.cmake
+++ /dev/null
@@ -1,115 +0,0 @@
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Copied right from the OpenXR-SDK (src/cmake/presentation.cmake).
-# Don't forget to add the license header above.
-
-set(PRESENTATION_BACKENDS xlib xcb wayland)
-set(PRESENTATION_BACKEND xlib CACHE STRING
- "Presentation backend chosen at configure time")
-set_property(CACHE PRESENTATION_BACKEND PROPERTY STRINGS
- ${PRESENTATION_BACKENDS})
-
-list(FIND PRESENTATION_BACKENDS ${PRESENTATION_BACKEND} index)
-if(index EQUAL -1)
- message(FATAL_ERROR "Presentation backend must be one of
- ${PRESENTATION_BACKENDS}")
-endif()
-
-message(STATUS "Using presentation backend: ${PRESENTATION_BACKEND}")
-
-
-if( PRESENTATION_BACKEND MATCHES "xlib" )
- find_package(X11 REQUIRED)
- if ((NOT X11_Xxf86vm_LIB) OR (NOT X11_Xrandr_LIB))
- message(FATAL_ERROR "OpenXR xlib backend requires Xxf86vm and Xrandr")
- endif()
-
- add_definitions( -DSUPPORT_X )
- add_definitions( -DOS_LINUX_XLIB )
- set( XLIB_LIBRARIES
- ${X11_LIBRARIES}
- ${X11_Xxf86vm_LIB}
- ${X11_Xrandr_LIB} )
-
-elseif( PRESENTATION_BACKEND MATCHES "xcb" )
- find_package(PkgConfig REQUIRED)
- # XCB + XCB GLX is limited to OpenGL 2.1
- # add_definitions( -DOS_LINUX_XCB )
- # XCB + Xlib GLX 1.3
- add_definitions( -DOS_LINUX_XCB_GLX )
-
- pkg_search_module(X11 REQUIRED x11)
- pkg_search_module(XCB REQUIRED xcb)
- pkg_search_module(XCB_RANDR REQUIRED xcb-randr)
- pkg_search_module(XCB_KEYSYMS REQUIRED xcb-keysyms)
- pkg_search_module(XCB_GLX REQUIRED xcb-glx)
- pkg_search_module(XCB_DRI2 REQUIRED xcb-dri2)
- pkg_search_module(XCB_ICCCM REQUIRED xcb-icccm)
-
- set( XCB_LIBRARIES
- ${XCB_LIBRARIES}
- ${XCB_KEYSYMS_LIBRARIES}
- ${XCB_RANDR_LIBRARIES}
- ${XCB_GLX_LIBRARIES}
- ${XCB_DRI2_LIBRARIES}
- ${X11_LIBRARIES} )
-
-elseif( PRESENTATION_BACKEND MATCHES "wayland" )
- find_package(PkgConfig REQUIRED)
- pkg_search_module(WAYLAND_CLIENT REQUIRED wayland-client)
- pkg_search_module(WAYLAND_EGL REQUIRED wayland-egl)
- pkg_search_module(WAYLAND_SCANNER REQUIRED wayland-scanner)
- pkg_search_module(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.7)
- pkg_search_module(EGL REQUIRED egl)
-
- add_definitions( -DOS_LINUX_WAYLAND )
- set( WAYLAND_LIBRARIES
- ${EGL_LIBRARIES}
- ${WAYLAND_CLIENT_LIBRARIES}
- ${WAYLAND_EGL_LIBRARIES} )
-
- # generate wayland protocols
- set(WAYLAND_PROTOCOLS_DIR ${CMAKE_SOURCE_DIR}/wayland-protocols/)
- file(MAKE_DIRECTORY ${WAYLAND_PROTOCOLS_DIR})
-
- pkg_get_variable(WAYLAND_PROTOCOLS_DATADIR wayland-protocols pkgdatadir)
- pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner)
-
- set(PROTOCOL xdg-shell-unstable-v6)
- set(PROTOCOL_XML
- ${WAYLAND_PROTOCOLS_DATADIR}/unstable/xdg-shell/${PROTOCOL}.xml)
-
- if( EXISTS ${PROTOCOL_XML} )
- execute_process(COMMAND
- ${WAYLAND_SCANNER}
- code
- ${PROTOCOL_XML}
- ${WAYLAND_PROTOCOLS_DIR}/${PROTOCOL}.c)
- execute_process(COMMAND
- ${WAYLAND_SCANNER}
- client-header
- ${PROTOCOL_XML}
- ${WAYLAND_PROTOCOLS_DIR}/${PROTOCOL}.h)
-
- set( WAYLAND_PROTOCOL_SRC
- ${WAYLAND_PROTOCOLS_DIR}/${PROTOCOL}.c
- ${WAYLAND_PROTOCOLS_DIR}/${PROTOCOL}.h )
-
- include_directories(${WAYLAND_PROTOCOLS_DIR})
- else()
- message(FATAL_ERROR
- "xdg-shell-unstable-v6.xml not found in "
- ${WAYLAND_PROTOCOLS_DATADIR}
- "\nYour wayland-protocols package does not "
- "contain xdg-shell-unstable-v6.")
- endif()
-endif()
diff --git a/build_files/cmake/Modules/xr_platform_defines.cmake b/build_files/cmake/Modules/xr_platform_defines.cmake
deleted file mode 100644
index 4c41b280c35..00000000000
--- a/build_files/cmake/Modules/xr_platform_defines.cmake
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (c) 2017 The Khronos Group Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# These defines are required as per the OpenXR specification. We can
-# just take them from the OpenXR-SDK's src/CMakeLists.txt. Not all of
-# them are needed (e.g. XCB and Wayland), but we just copy them anyway.
-
-if(WIN32)
- add_definitions(-DXR_OS_WINDOWS)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- add_definitions(-DXR_OS_LINUX)
-endif()
-
-# Determine the presentation backend for Linux systems.
-# Use an include because the code is pretty big.
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- include(presentation)
-endif()
-
-# Several files use these compile-time platform switches
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
- add_definitions( -DXR_USE_PLATFORM_WIN32 )
-elseif( PRESENTATION_BACKEND MATCHES "xlib" )
- add_definitions( -DXR_USE_PLATFORM_XLIB )
-elseif( PRESENTATION_BACKEND MATCHES "xcb" )
- add_definitions( -DXR_USE_PLATFORM_XCB )
-elseif( PRESENTATION_BACKEND MATCHES "wayland" )
- add_definitions( -DXR_USE_PLATFORM_WAYLAND )
-endif()
-
-add_definitions(-DXR_USE_GRAPHICS_API_OPENGL)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
- add_definitions(-DXR_USE_GRAPHICS_API_D3D)
- add_definitions(-DXR_USE_GRAPHICS_API_D3D10)
- add_definitions(-DXR_USE_GRAPHICS_API_D3D11)
- add_definitions(-DXR_USE_GRAPHICS_API_D3D12)
-endif()
-
More information about the Bf-blender-cvs
mailing list