Changeset 7e38970d in mainline for uspace/lib/gfxfont/meson.build

Timestamp:

2020-12-07T00:08:37Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

25f26600

Parents:

7a873f0 (diff), 8596474 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'jxsvoboda-gfx' into master

File:

• uspace/lib/gfxfont/meson.build (moved) (moved from uspace/lib/gui/meson.build ) (2 diffs)

uspace/lib/gfxfont/meson.build

@@ -1 +1 @@
 #
-# Copyright (c) 2012 Petr Koupy
+# Copyright (c) 2020 Jiri Svoboda
 # All rights reserved.
 #
@@ -27 +27 @@
 #
 
-deps = [ 'draw' , 'softrend', 'display' ]
+deps = [ 'gfx', 'riff' ]
 src = files(
-        'common.c',
-        'button.c',
-        'canvas.c',
-        'connection.c',
-        'grid.c',
-        'label.c',
-        'minimal.c',
-        'terminal.c',
-        'widget.c',
-        'window.c',
+        'src/font.c',
+        'src/glyph.c',
+        'src/glyph_bmp.c',
+        'src/text.c',
+        'src/typeface.c',
 )
+
+test_src = files(
+        'test/font.c',
+        'test/glyph.c',
+        'test/glyph_bmp.c',
+        'test/main.c',
+        'test/text.c',
+        'test/tpf.c',
+        'test/typeface.c',
+)