Changeset dbf1be5 in mainline

Timestamp:

2021-03-25T21:12:23Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

417ff46, bfb055b, fbc6b6c

Parents:

e9f7778

Message:

Fix XCW

Files:

• tools/export.sh (modified) (1 diff)
• tools/xcw/bin/helenos-pkg-config (modified) (1 diff)
• tools/xcw/demo/Makefile (modified) (1 diff)
• uspace/lib/math/_dummy.h (added)
• uspace/lib/meson.build (modified) (1 diff)

tools/export.sh

@@ -42 +42 @@
         uspace/lib/libclui.a \
         uspace/lib/libc.a \
+        uspace/lib/libcongfx.a \
         uspace/lib/libcpp.a \
         uspace/lib/libdisplay.a \

tools/xcw/bin/helenos-pkg-config

@@ -44 +44 @@
 libmath_libs="$LIB_DIR/libmath.a"
 
-libui_cflags="-I$INCLUDE_DIR/libui -I$INCLUDE_DIR/libdisplay -I$INCLUDE_DIR/libgfx -I$INCLUDE_DIR/libipcgfx"
-libui_libs="$LIB_DIR/libui.a $LIB_DIR/libdisplay.a $LIB_DIR/libipcgfx.a $LIB_DIR/libgfx.a $LIB_DIR/libgfxfont.a $LIB_DIR/libriff.a $LIB_DIR/libmemgfx.a"
+libui_cflags="-I$INCLUDE_DIR/libui -I$INCLUDE_DIR/libdisplay -I$INCLUDE_DIR/libgfx -I$INCLUDE_DIR/libipcgfx -I$INCLUDE_DIR/libcongfx"
+libui_libs="$LIB_DIR/libui.a $LIB_DIR/libdisplay.a $LIB_DIR/libipcgfx.a $LIB_DIR/libcongfx.a $LIB_DIR/libgfx.a $LIB_DIR/libgfxfont.a $LIB_DIR/libriff.a $LIB_DIR/libmemgfx.a"
 
 libgfximage_cflags="-I$INCLUDE_DIR/libgfximage"

tools/xcw/demo/Makefile

@@ -50 +50 @@
 INSTALL = install
 TEST = helenos-test
-CFLAGS = -std=gnu11 -Wall `helenos-pkg-config --cflags libui libdraw libmath` \
+CFLAGS = -std=gnu11 -Wall `helenos-pkg-config --cflags libui libgfximage` \
     -D_HELENOS_SOURCE
-LIBS = `helenos-pkg-config --libs libui libdraw libmath`
+LIBS = `helenos-pkg-config --libs libui libgfximage`
 PREFIX = `helenos-bld-config --install-dir`
 output = viewer

uspace/lib/meson.build

@@ -42 +42 @@
         'gfximage',
         'ipcgfx',
+        'congfx',
         'display',
         'ui',