Changeset 7e38970d in mainline for tools

Timestamp:

2020-12-07T00:08:37Z (5 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

Location:

tools

Files:

• export.sh (modified) (1 diff)
• xcw/bin/helenos-pkg-config (modified) (3 diffs)
• xcw/demo/Makefile (modified) (1 diff)

tools/export.sh

@@ -39 +39 @@
 
 EXPORT_LIBS=" \
-        uspace/lib/libmath.a \
+        uspace/lib/c/libstartfiles.a \
         uspace/lib/libclui.a \
+        uspace/lib/libc.a \
+        uspace/lib/libcpp.a \
         uspace/lib/libdisplay.a \
         uspace/lib/libgfx.a \
-        uspace/lib/libgui.a \
+        uspace/lib/libgfxfont.a \
+        uspace/lib/libgfximage.a \
+        uspace/lib/libhound.a \
         uspace/lib/libipcgfx.a \
-        uspace/lib/libdraw.a \
-        uspace/lib/libsoftrend.a \
-        uspace/lib/libhound.a \
+        uspace/lib/libmath.a \
+        uspace/lib/libmemgfx.a \
         uspace/lib/libpcm.a \
-        uspace/lib/libcpp.a \
-        uspace/lib/libc.a \
-        uspace/lib/c/libstartfiles.a \
+        uspace/lib/libpixconv.a \
         uspace/lib/libposix.a \
+        uspace/lib/libriff.a \
+        uspace/lib/libui.a \
 "
 

tools/xcw/bin/helenos-pkg-config

@@ -1 +1 @@
 #!/bin/bash
 #
-# Copyright (c) 2015 Jiri Svoboda
+# Copyright (c) 2020 Jiri Svoboda
 # All rights reserved.
 #
@@ -44 +44 @@
 libmath_libs="$LIB_DIR/libmath.a"
 
-libgui_cflags="-I$INCLUDE_DIR/libgui -I$INCLUDE_DIR/libdisplay -I$INCLUDE_DIR/libgfx -I$INCLUDE_DIR/libipcgfx"
-libgui_libs="$LIB_DIR/libgui.a $LIB_DIR/libdisplay.a $LIB_DIR/libipcgfx.a $LIB_DIR/libgfx.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"
 
-libdraw_cflags="-I$INCLUDE_DIR/libdraw"
-libdraw_libs="$LIB_DIR/libdraw.a $LIB_DIR/libsoftrend.a"
+libgfximage_cflags="-I$INCLUDE_DIR/libgfximage"
+libgfximage_libs="$LIB_DIR/libgfximage.a $LIB_DIR/libpixconv.a"
 
 libhound_cflags="-I$INCLUDE_DIR/libhound"
@@ -75 +75 @@
         (.*)
             case "$1" in
-            (libgui) ;;
-            (libdraw) ;;
+            (libui) ;;
+            (libgfximage) ;;
             (libmath) ;;
             (libhound) ;;

tools/xcw/demo/Makefile

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