Changeset 7e38970d in mainline for uspace/app/launcher/meson.build

Timestamp:

2020-12-07T00:08:37Z (3 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/app/launcher/meson.build (moved) (moved from uspace/app/vlaunch/meson.build ) (4 diffs)

uspace/app/launcher/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'gui' ]
+deps = [ 'gfximage', 'ui' ]
 
 _images = files('gfx/helenos.tga')
 
-_images_zip = custom_target('vlaunch_images.zip',
+_images_zip = custom_target('launcher_images.zip',
         input : _images,
         output : [ 'images.zip' ],
         command : [ mkarray, '@OUTDIR@', 'images', 'image', uspace_as_prolog, '.data', '@INPUT@' ],
 )
-_imgs_s = custom_target('vlaunch_images.s',
+_imgs_s = custom_target('launcher_images.s',
         input : _images_zip,
         output : [ 'images.s' ],
@@ -42 +42 @@
         capture : true,
 )
-_imgs_h = custom_target('vlaunch_images.h',
+_imgs_h = custom_target('launcher_images.h',
         input : _images_zip,
         output : [ 'images.h' ],
@@ -48 +48 @@
         capture : true,
 )
-_imgs_desc_c = custom_target('vlaunch_images_desc.c',
+_imgs_desc_c = custom_target('launcher_images_desc.c',
         input : _images_zip,
         output : [ 'images_desc.c' ],
@@ -55 +55 @@
 )
 
-src = [ files('vlaunch.c'), _imgs_s, _imgs_h, _imgs_desc_c ]
+src = [ files('launcher.c'), _imgs_s, _imgs_h, _imgs_desc_c ]