mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 19:19:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix angle macos build (#24750)

Browse Source 
* Fix angle macos build

* Fix angle port version

* Fix angle port version

* Fix angle_common source files for macos

* upgrade angle port version to #4

* Fix angle port version, again...

* Fix angle port version, again, again...
This commit is contained in:
xiaozhuai, Weihang Ding 2022-05-19 05:34:45 +08:00 committed by GitHub
parent 1e91cd3769
commit 52955a7ae5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ports/angle/CMakeLists.txt
View File

@ -72,7 +72,21 @@ elseif(APPLE)
set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_win|_mac")
endif()
endif()
if(APPLE)
set(ANGLE_COMMON_PLATFORM_SOURCES
"src/common/apple/*.h"
"src/common/apple/*.cpp"
"src/common/apple/*.mm"
"src/common/gl/cgl/*.h"
"src/common/gl/cgl/*.cpp"
"src/common/gl/cgl/*.mm")
else()
set(ANGLE_COMMON_PLATFORM_SOURCES )
endif()
file(GLOB ANGLE_COMMON_SOURCES
${ANGLE_COMMON_PLATFORM_SOURCES}
"src/common/*.h"
"src/common/*.inc"
"src/common/*.cpp"
@ -341,6 +355,9 @@ if(WINDOWS_DESKTOP OR LINUX OR APPLE)
"src/libANGLE/renderer/gl/cgl/*.mm"
"src/libANGLE/renderer/gl/cgl/*.cpp"
"src/libANGLE/renderer/gl/cgl/*.h"
"src/libANGLE/renderer/gl/apple/*.mm"
"src/libANGLE/renderer/gl/apple/*.cpp"
"src/libANGLE/renderer/gl/apple/*.h"
"gpu_info_util/SystemInfo_macos.mm"
)
elseif(LINUX)

2
ports/angle/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "angle",
"version-string": "chromium_4472",
"port-version": 2,
"port-version": 3,
"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."

5
versions/a-/angle.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c3b63c0d8bf584235c057cb40486152ebe3fa0a6",
"version-string": "chromium_4472",
"port-version": 3
},
{
"git-tree": "3c4f08e40691d643044cf9319cef04b4289d4b6f",
"version-string": "chromium_4472",

2
versions/baseline.json
View File

@ -86,7 +86,7 @@
},
"angle": {
"baseline": "chromium_4472",
"port-version": 2
"port-version": 3
},
"antlr4": {
"baseline": "4.9.3",