diff options
| author | Cheney Wang <38240633+Cheney-W@users.noreply.github.com> | 2019-08-07 01:27:37 +0800 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-08-06 13:27:37 -0400 |
| commit | 60676aa9094ab9d3e75b9668c3e78895ee19d233 (patch) | |
| tree | 7ef1e752c3b84bb8ba03ebe46cefaed63ef873b6 | |
| parent | 22e0b9f376a66e6717f820e6c382c4112191ef9b (diff) | |
| download | vcpkg-60676aa9094ab9d3e75b9668c3e78895ee19d233.tar.gz vcpkg-60676aa9094ab9d3e75b9668c3e78895ee19d233.zip | |
[Openxr-loader] Remove the invalid patch (#7560)
| -rw-r--r-- | ports/openxr-loader/0004-fix-fatal-errorC1189.patch | 13 | ||||
| -rw-r--r-- | ports/openxr-loader/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openxr-loader/portfile.cmake | 2 |
3 files changed, 1 insertions, 16 deletions
diff --git a/ports/openxr-loader/0004-fix-fatal-errorC1189.patch b/ports/openxr-loader/0004-fix-fatal-errorC1189.patch deleted file mode 100644 index f71a99c62..000000000 --- a/ports/openxr-loader/0004-fix-fatal-errorC1189.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/loader/CMakeLists.txt b/src/loader/CMakeLists.txt
-index 92985a5..b265091 100644
---- a/src/loader/CMakeLists.txt
-+++ b/src/loader/CMakeLists.txt
-@@ -134,7 +134,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
- endforeach()
-
- target_link_libraries(${LOADER_NAME} shlwapi)
-- target_compile_options(${LOADER_NAME} PRIVATE)
-+ target_compile_options(${LOADER_NAME} PRIVATE /std:c++17)
- generate_export_header(${LOADER_NAME})
- # set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS false)
-
diff --git a/ports/openxr-loader/CONTROL b/ports/openxr-loader/CONTROL index 025b15f80..cff29cb1b 100644 --- a/ports/openxr-loader/CONTROL +++ b/ports/openxr-loader/CONTROL @@ -1,5 +1,5 @@ Source: openxr-loader -Version: 1.0.0-1 +Version: 1.0.0-2 Description: Khronos API for abstracting VR/MR/AR hardware Feature: vulkan diff --git a/ports/openxr-loader/portfile.cmake b/ports/openxr-loader/portfile.cmake index 70c6dc688..efb57b0c3 100644 --- a/ports/openxr-loader/portfile.cmake +++ b/ports/openxr-loader/portfile.cmake @@ -15,8 +15,6 @@ vcpkg_from_github( REF release-1.0.0 SHA512 423079b841a01f3b51283839c565cfa1b8ff38348c3f3d6f62e9120569d4ad540d8d6bfe8010e74d9bbb76aeaedcf273e5e3b1717bb0b424898793fb4712aa58 HEAD_REF master - PATCHES - 0004-fix-fatal-errorC1189.patch ) # Weird behavior inside the OpenXR loader. On Windows they force shared libraries to use static crt, and |