diff --git a/etc/dylib.conf b/etc/dylib.conf index ec298ec96..b39fc7b9c 100644 --- a/etc/dylib.conf +++ b/etc/dylib.conf @@ -109,6 +109,9 @@ C=libAppKit.so [QuartzCore.framework] A=libQuartzCore.so +[CoreGraphics.framework] +A=libCoreGraphics.so + [SystemConfiguration.framework] A=libSystemConfiguration.so diff --git a/src/ApplicationServices/CMakeLists.txt b/src/ApplicationServices/CMakeLists.txt index 2c343b65e..24bff41b0 100644 --- a/src/ApplicationServices/CMakeLists.txt +++ b/src/ApplicationServices/CMakeLists.txt @@ -10,8 +10,8 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -add_library(ApplicationServices SHARED $) -target_link_libraries(ApplicationServices system CoreServices lcms png gif tiff jpeg X11 Xext Xrender fontconfig cairo) +add_library(ApplicationServices SHARED empty.c) +target_link_libraries(ApplicationServices system CoreServices CoreGraphics) install(TARGETS ApplicationServices DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") diff --git a/src/ApplicationServices/empty.c b/src/ApplicationServices/empty.c new file mode 100644 index 000000000..e69de29bb diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6f30a4270..b6f73e8b0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -121,6 +121,7 @@ add_subdirectory(external/libxpc) add_subdirectory(external/openssl_certificates) add_subdirectory(external/liblcms1) add_subdirectory(external/coregraphics) +add_subdirectory(external/coreanimation) add_subdirectory(external/rik-theme) if (NOT DARLING_NO_EXECUTABLES) diff --git a/src/external/coreanimation b/src/external/coreanimation index d142110ea..1d3a2ed18 160000 --- a/src/external/coreanimation +++ b/src/external/coreanimation @@ -1 +1 @@ -Subproject commit d142110eab5a32cde48d2f2c957ba08e030d75ed +Subproject commit 1d3a2ed184dca3f182ba722e08b8fc3094231500 diff --git a/src/external/coregraphics b/src/external/coregraphics index 86e9eba9a..92e401e96 160000 --- a/src/external/coregraphics +++ b/src/external/coregraphics @@ -1 +1 @@ -Subproject commit 86e9eba9a1e468cefd6e1a5f4956f64be7865532 +Subproject commit 92e401e963bf60d511444bbef92a0a6eb655ab72