darlinghq/darling-cocotron
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-cocotron.git synced 2025-02-25 22:36:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Build O2Font_FT in Onyx2D and make sure it gets used instead of the dummy O2Font_ttf

Browse Source
This commit is contained in:
Sergey Bugaev 2017-12-16 12:10:28 +03:00
parent f9d0726316
commit b674c51dd5
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AppKit/CMakeLists.txt
View File

@ -294,7 +294,7 @@ set(AppKit_sources
X11.subproj/O2Surface_cairo.m
X11.subproj/X11Window.m
X11.subproj/KTFont_FT.m
X11.subproj/O2Font_FT.m
# O2Font_FT.m is built in Onyx2D
# CGLContext.m is built in OpenGL
X11.subproj/NSOpenGLDrawable_X11.m
X11.subproj/O2Context_cairo.m

9
Onyx2D/CMakeLists.txt
View File

@ -17,6 +17,9 @@ find_package(PNG REQUIRED)
find_package(TIFF REQUIRED)
find_package(JPEG REQUIRED)
find_package(PkgConfig REQUIRED)
pkg_check_modules(PC_FONTCONFIG fontconfig)
include_directories(
${CMAKE_SOURCE_DIR}/src/external/foundation/include
${CMAKE_SOURCE_DIR}/src/external/foundation/include/Foundation
@ -43,6 +46,7 @@ include_directories(
${PNG_INCLUDE_DIRS}
${TIFF_INCLUDE_DIRS}
${JPEG_INCLUDE_DIRS}
${PC_FONTCONFIG_INCLUDE_DIRS}
)
set(Onyx2D_sources
@ -71,7 +75,7 @@ set(Onyx2D_sources
O2Font_freetype.m
O2Font.m
O2Font+PDF.m
O2Font_ttf.m
# O2Font_ttf.m
O2Function.m
O2Function+PDF.m
O2Geometry.m
@ -138,6 +142,8 @@ set(Onyx2D_sources
O2TTFDecoder.m
O2zlib.m
VGPath.m
../AppKit/X11.subproj/O2Font_FT.m
)
set_source_files_properties(${Onyx2D_sources} LANGUAGE C)
@ -157,4 +163,5 @@ add_framework(Onyx2D
# native libraries
FreeType
jpeg png tiff
fontconfig
)