Changeset ddb844e in mainline for uspace/lib/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/meson.build (modified) (5 diffs)

uspace/lib/meson.build

@@ -33 +33 @@
         'c',
         'math',
+        'display',
         'gui',
         'draw',
@@ -39 +40 @@
         'clui',
         'pcm',
-        'hound'
+        'hound',
+        'gfx',
+        'ipcgfx',
+        'display',
 ]
 
@@ -55 +59 @@
         'fmtutil',
         'fs',
-        'graph',
+        'gfx',
         'http',
         'label',
@@ -72 +76 @@
 
         'bithenge',
+        'congfx',
         'draw',
         'drv',
         'ext4',
-        'gui',
         'hound',
+        'ipcgfx',
+        'memgfx',
         'nic',
         'usb',
@@ -86 +92 @@
 
         'ieee80211',
+        'ddev',
+        'display',
+
+        'gui',
+
+        'guigfx',
 ]