Changeset 7e38970d in mainline for tools/xcw/bin/helenos-pkg-config

Timestamp:

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

• tools/xcw/bin/helenos-pkg-config (modified) (3 diffs)

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) ;;