Changeset 3e828ea in mainline for uspace/lib/gfx

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

Location:

uspace/lib/gfx

Files:

• Makefile (deleted)
• meson.build (moved) (moved from uspace/lib/fdisk/Makefile ) (1 diff)
• src/backend/console.c (modified) (1 diff)
• src/color.c (modified) (1 diff)

uspace/lib/gfx/meson.build

@@ -27 +27 @@
 #
 
-USPACE_PREFIX = ../..
+src = files(
+        'src/backend/console.c',
+        'src/color.c',
+        'src/context.c',
+        'src/render.c'
+)
 
-LIBRARY = libfdisk
-
-SOURCES = \
-        src/fdisk.c
-
-include $(USPACE_PREFIX)/Makefile.common
+test_src = files(
+        'test/color.c',
+        'test/main.c',
+        'test/render.c',
+)

uspace/lib/gfx/src/backend/console.c

@@ -43 +43 @@
 #include <io/pixel.h>
 #include <stdlib.h>
-#include "private/backend/console.h"
-#include "private/color.h"
+#include "../../private/backend/console.h"
+#include "../../private/color.h"
 
 static errno_t console_gc_set_color(void *, gfx_color_t *);

uspace/lib/gfx/src/color.c

@@ -37 +37 @@
 #include <stdint.h>
 #include <stdlib.h>
-#include "private/color.h"
+#include "../private/color.h"
 
 /** Create new 16-bit per channel RGB color.