diff options
| author | Alexej Harm <alexej.h@xiphos.de> | 2019-03-25 21:35:08 +0100 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-03-25 13:35:08 -0700 |
| commit | 6798bc3234653de2c1195ce846efad9604fc3b67 (patch) | |
| tree | 13ee9aee435ac470388da43b5636750d69ff1c91 | |
| parent | e3737888ad8f7b6e9b015fedd5a999e9e3c84e95 (diff) | |
| download | vcpkg-6798bc3234653de2c1195ce846efad9604fc3b67.tar.gz vcpkg-6798bc3234653de2c1195ce846efad9604fc3b67.zip | |
[angle] Fixed build with /permissive- toolchain on Windows and clang on Linux (#5785)
| -rw-r--r-- | ports/angle/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ports/angle/CONTROL | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt index 7bd7d77c9..82caf9289 100644 --- a/ports/angle/CMakeLists.txt +++ b/ports/angle/CMakeLists.txt @@ -19,9 +19,11 @@ else() endif()
if(WINDOWS_ANY)
- add_compile_options(/d2guard4 /Wv:18 /guard:cf)
+ add_compile_options(/d2guard4 /Wv:18 /guard:cf /permissive)
else()
- add_compile_options(-std=c++17 -fPIC)
+ set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif()
if (APPLE)
diff --git a/ports/angle/CONTROL b/ports/angle/CONTROL index 81b32f631..afdb07262 100644 --- a/ports/angle/CONTROL +++ b/ports/angle/CONTROL @@ -1,5 +1,5 @@ Source: angle
-Version: 2019-03-13-c2ee2cc
+Version: 2019-03-13-c2ee2cc-1
Description: A conformant OpenGL ES implementation for Windows, Mac and Linux.
The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support.
Build-Depends: egl-registry
|