diff --git a/ports/angle/cmake-buildsystem/PlatformMac.cmake b/ports/angle/cmake-buildsystem/PlatformMac.cmake index 52c2c08961e5db..4fda2ba46bb02d 100644 --- a/ports/angle/cmake-buildsystem/PlatformMac.cmake +++ b/ports/angle/cmake-buildsystem/PlatformMac.cmake @@ -1,8 +1,3 @@ -find_library(COREGRAPHICS_LIBRARY CoreGraphics) -find_library(FOUNDATION_LIBRARY Foundation) -find_library(IOKIT_LIBRARY IOKit) -find_library(IOSURFACE_LIBRARY IOSurface) -find_library(QUARTZ_LIBRARY Quartz) find_package(ZLIB REQUIRED) list(APPEND ANGLE_SOURCES @@ -12,16 +7,15 @@ list(APPEND ANGLE_SOURCES ) list(APPEND ANGLEGLESv2_LIBRARIES - ${COREGRAPHICS_LIBRARY} - ${FOUNDATION_LIBRARY} - ${IOKIT_LIBRARY} - ${IOSURFACE_LIBRARY} - ${QUARTZ_LIBRARY} + "-framework CoreGraphics" + "-framework Foundation" + "-framework IOKit" + "-framework IOSurface" + "-framework Quartz" ) # Metal backend if(USE_METAL) - find_library(METAL_LIBRARY Metal) list(APPEND ANGLE_SOURCES ${_metal_backend_sources} @@ -35,7 +29,7 @@ if(USE_METAL) ) list(APPEND ANGLEGLESv2_LIBRARIES - ${METAL_LIBRARY} + "-framework Metal" ) endif() diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json index 12ac3a4df8cf95..1f9cdf9a00e645 100644 --- a/ports/angle/vcpkg.json +++ b/ports/angle/vcpkg.json @@ -1,7 +1,7 @@ { "name": "angle", "version-string": "chromium_5414", - "port-version": 6, + "port-version": 7, "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." diff --git a/versions/a-/angle.json b/versions/a-/angle.json index fe0f1cb5e40472..ee8d454e311349 100644 --- a/versions/a-/angle.json +++ b/versions/a-/angle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5502570ef18abdcf0535470f3ea6589db70607b", + "version-string": "chromium_5414", + "port-version": 7 + }, { "git-tree": "28f33feb91072e2df5daa5b7e10846db4a6f3a50", "version-string": "chromium_5414", diff --git a/versions/baseline.json b/versions/baseline.json index 180424fb99f5eb..ef3c9f23c416fa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -126,7 +126,7 @@ }, "angle": { "baseline": "chromium_5414", - "port-version": 6 + "port-version": 7 }, "annoy": { "baseline": "1.17.2",