Changeset ddb844e in mainline for tools

Timestamp:

2020-07-03T23:00:34Z (5 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

Location:

tools

Files:

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

tools/export.sh

@@ -41 +41 @@
         uspace/lib/libmath.a \
         uspace/lib/libclui.a \
+        uspace/lib/libdisplay.a \
+        uspace/lib/libgfx.a \
         uspace/lib/libgui.a \
+        uspace/lib/libipcgfx.a \
         uspace/lib/libdraw.a \
         uspace/lib/libsoftrend.a \

tools/xcw/bin/helenos-pkg-config

@@ -44 +44 @@
 libmath_libs="$LIB_DIR/libmath.a"
 
-libgui_cflags="-I$INCLUDE_DIR/libgui"
-libgui_libs="$LIB_DIR/libgui.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"
 
 libdraw_cflags="-I$INCLUDE_DIR/libdraw"
@@ -55 +55 @@
 libpcm_cflags="-I$INCLUDE_DIR/libpcm"
 libpcm_libs="$LIB_DIR/libpcm.a"
+
+libgfx_cflags="-I$INCLUDE_DIR/libgfx"
+libgfx_libs="$LIB_DIR/libgfx.a"
+
+libipcgfx_cflags="-I$INCLUDE_DIR/libipcgfx"
+libipcgfx_libs="$LIB_DIR/libipcgfx.a"
+
+libdisplay_cflags="-I$INCLUDE_DIR/libdisplay"
+libdisplay_libs="$LIB_DIR/libdisplay.a"
 
 action=none
@@ -71 +80 @@
             (libhound) ;;
             (libpcm) ;;
+            (libgfx) ;;
+            (libipcgfx) ;;
+            (libdisplay) ;;
             (*) echo "Unknown package $1" >&2; exit 1;;
             esac