Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tgfx. #1845

Merged
merged 2 commits into from
Nov 8, 2023
Merged

Update tgfx. #1845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b975625
Update tgfx.
domchen Nov 8, 2023
a75b322
Add '-ld_classic' only when the appleclang version is greater than 15.0
domchen Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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})
Expand Down Expand Up @@ -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/*.*)
Expand Down Expand Up @@ -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)
Expand All @@ -407,28 +403,36 @@ 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")

# used to generate baseline images to the out/ directory. each image has a "_base" suffix.
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 ()
4 changes: 2 additions & 2 deletions DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down