diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-23 16:49:28 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-23 16:49:28 -0400 |
| commit | 626920dda38a512b27c5e8fd79b0c9b09be01898 (patch) | |
| tree | 89c54e31848048ee084005fd3a0a1316f5530966 /indra/cmake/FreeType.cmake | |
| parent | f6b3b5e803b0c08d55ecd10eac3e9e75518760a9 (diff) | |
| parent | d8e52ec001c476a2320f2d5caceb813465d707e4 (diff) | |
Merge remote branch 'develop' into release/luau-scripting for Maint B
Diffstat (limited to 'indra/cmake/FreeType.cmake')
| -rw-r--r-- | indra/cmake/FreeType.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake index 563491556d..47ac96f793 100644 --- a/indra/cmake/FreeType.cmake +++ b/indra/cmake/FreeType.cmake @@ -11,6 +11,8 @@ target_include_directories( ll::freetype SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/ if (WINDOWS) target_link_libraries( ll::freetype INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/freetype.lib) +elseif( LINUX ) + target_link_libraries( ll::freetype INTERFACE ${LIBS_PREBUILT_DIR}/lib/release/libfreetype.a ${LIBS_PREBUILT_DIR}/lib/release/libpng16.a) else() target_link_libraries( ll::freetype INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libfreetype.a) endif() |