diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b1dfa50cc..e877d386c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,6 +96,7 @@ endif ()
 if (PAG_BUILD_TESTS)
     set(PAG_USE_FREETYPE ON)
     set(PAG_USE_HARFBUZZ ON)
+    set(PAG_BUILD_SHARED OFF)
 endif ()
 
 file(STRINGS "src/rendering/PAG.cpp" VERSION_FILE)
@@ -120,9 +121,9 @@ message("PAG_VERSION: ${PAG_VERSION}")
 message("PAG_USE_LIBAVC: ${PAG_USE_LIBAVC}")
 message("PAG_USE_RTTR: ${PAG_USE_RTTR}")
 message("PAG_USE_HARFBUZZ: ${PAG_USE_HARFBUZZ}")
+message("PAG_USE_C: ${PAG_USE_C}")
 message("PAG_BUILD_SHARED: ${PAG_BUILD_SHARED}")
 message("PAG_BUILD_TESTS: ${PAG_BUILD_TESTS}")
-message("PAG_USE_C: ${PAG_USE_C}")
 message("TGFX_DIR: ${TGFX_DIR}")
 
 set(TGFX_USE_OPENGL ${PAG_USE_OPENGL})
@@ -165,7 +166,7 @@ if (PAG_USE_QT)
         list(APPEND PAG_PLATFORM_FILES ${CGL_PLATFORM_FILES})
     endif ()
 elseif (PAG_USE_SWIFTSHADER)
-    file(GLOB SWIFTSHADER_LIBRARIES ${TGFX_DIR}/vendor/swiftshader/${LIBRARY_ENTRY}/*${CMAKE_SHARED_LIBRARY_SUFFIX})
+    file(GLOB SWIFTSHADER_LIBRARIES ${TGFX_DIR}/vendor/swiftshader/${PLATFORM}/${ARCH}/*${CMAKE_SHARED_LIBRARY_SUFFIX})
     list(APPEND PAG_PLATFORM_SHARED_LIBS ${SWIFTSHADER_LIBRARIES})
     list(APPEND PAG_PLATFORM_INCLUDES ${TGFX_DIR}/vendor/swiftshader/include)
     file(GLOB_RECURSE PAG_PLATFORM_FILES src/platform/swiftshader/*.*)
@@ -390,13 +391,8 @@ if (PAG_BUILD_TESTS)
         message(WARNING "The local md5 cache is out of date! Please run the 'update_baseline.sh' to regenerate the cache.")
     endif ()
 
-    add_library(pag-static STATIC ${PAG_VENDOR_TARGET} ${PAG_FILES} ${PAG_PLATFORM_FILES} $<TARGET_OBJECTS:tgfx>)
-    merge_libraries_into(pag-static ${PAG_PLATFORM_STATIC_LIBS} ${TGFX_PLATFORM_STATIC_LIBS})
-    target_include_directories(pag-static PUBLIC ${PAG_INCLUDES} ${PAG_PLATFORM_INCLUDES})
-    target_link_libraries(pag-static tgfx ${PAG_PLATFORM_STATIC_LIBS} ${TGFX_PLATFORM_STATIC_LIBS} ${PAG_PLATFORM_SHARED_LIBS})
-
     file(GLOB_RECURSE PAG_TEST_FILES test/src/*.*)
-    list(APPEND TEST_PLATFORM_LIBS pag-static ${PAG_PLATFORM_SHARED_LIBS})
+    list(APPEND TEST_PLATFORM_LIBS pag ${PAG_PLATFORM_SHARED_LIBS})
     list(APPEND TEST_INCLUDES ${PAG_INCLUDES} test/src ${TGFX_DIR}/third_party/json/include)
 
     set(GOOGLE_TEST_DIR ${TGFX_DIR}/third_party/googletest/googletest)
@@ -407,10 +403,15 @@ if (PAG_BUILD_TESTS)
     list(APPEND TEST_PLATFORM_LIBS ${FFAVC_LIB})
     list(APPEND TEST_INCLUDES vendor/ffavc/include)
 
+    if (MACOS AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15.0)
+        list(APPEND TEST_LINK_OPTIONS "-ld_classic")
+    endif ()
+
     # used to update the local md5 data for baseline testing.
     add_executable(UpdateBaseline ${PAG_TEST_FILES})
     target_include_directories(UpdateBaseline PUBLIC ${TEST_INCLUDES})
     target_compile_definitions(UpdateBaseline PUBLIC UPDATE_BASELINE)
+    target_link_options(UpdateBaseline PRIVATE ${TEST_LINK_OPTIONS})
     target_link_libraries(UpdateBaseline ${TEST_PLATFORM_LIBS})
     set_target_properties(UpdateBaseline PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -fno-access-control")
 
@@ -418,17 +419,20 @@ if (PAG_BUILD_TESTS)
     add_executable(GenerateImages ${PAG_TEST_FILES})
     target_include_directories(GenerateImages PUBLIC ${TEST_INCLUDES})
     target_compile_definitions(GenerateImages PUBLIC GENERATOR_BASELINE_IMAGES)
+    target_link_options(GenerateImages PRIVATE ${TEST_LINK_OPTIONS})
     target_link_libraries(GenerateImages ${TEST_PLATFORM_LIBS})
     set_target_properties(GenerateImages PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -fno-access-control")
 
     add_executable(PAGUnitTest ${PAG_TEST_FILES})
     target_include_directories(PAGUnitTest PUBLIC ${TEST_INCLUDES})
     target_compile_definitions(PAGUnitTest PUBLIC SKIP_FRAME_COMPARE)
+    target_link_options(PAGUnitTest PRIVATE ${TEST_LINK_OPTIONS})
     target_link_libraries(PAGUnitTest ${TEST_PLATFORM_LIBS})
     set_target_properties(PAGUnitTest PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -fno-access-control")
 
     add_executable(PAGFullTest ${PAG_TEST_FILES})
     target_include_directories(PAGFullTest PUBLIC ${TEST_INCLUDES})
+    target_link_options(PAGFullTest PRIVATE ${TEST_LINK_OPTIONS})
     target_link_libraries(PAGFullTest ${TEST_PLATFORM_LIBS})
     set_target_properties(PAGFullTest PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -fno-access-control")
 endif ()
diff --git a/DEPS b/DEPS
index 79d55f2cf9..a140558f13 100644
--- a/DEPS
+++ b/DEPS
@@ -7,12 +7,12 @@
     "common": [
       {
         "url": "${PAG_GROUP}/vendor_tools.git",
-        "commit": "61d83146d415de572e1f46c450024fa30caae33c",
+        "commit": "73109a06b6606308dc1deb8ac78c3780cd71696e",
         "dir": "third_party/vendor_tools"
       },
       {
         "url": "${PAG_GROUP}/tgfx.git",
-        "commit": "3fbfd83d935b880bc58bbd94fa35e2d851867e6e",
+        "commit": "0039ebe407ee273988ef25fc94b1b44defd2e792",
         "dir": "third_party/tgfx",
         "keeps": [
           "third_party"