Changeset ddb844e in mainline for uspace/lib/guigfx/meson.build

Timestamp:

2020-07-03T23:00:34Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e79a025

Parents:

edb57bc6 (diff), 1a1c75e (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:

Resolve merge conflicts

File:

• uspace/lib/guigfx/meson.build (moved) (moved from uspace/srv/hid/compositor/meson.build ) (2 diffs)

uspace/lib/guigfx/meson.build

@@ -1 +1 @@
 #
-# Copyright (c) 2012 Petr Koupy
+# Copyright (c) 2019 Jiri Svoboda
 # All rights reserved.
 #
@@ -27 +27 @@
 #
 
-deps = [ 'draw', 'softrend', 'drv', 'compress', 'math' ]
-src = files('compositor.c')
+deps = [ 'gui', 'gfx', 'memgfx' ]
+src = files(
+        'src/canvas.c'
+)