Changeset ddb844e in mainline for tools


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • tools/export.sh

    redb57bc6 rddb844e  
    4141        uspace/lib/libmath.a \
    4242        uspace/lib/libclui.a \
     43        uspace/lib/libdisplay.a \
     44        uspace/lib/libgfx.a \
    4345        uspace/lib/libgui.a \
     46        uspace/lib/libipcgfx.a \
    4447        uspace/lib/libdraw.a \
    4548        uspace/lib/libsoftrend.a \
  • tools/xcw/bin/helenos-pkg-config

    redb57bc6 rddb844e  
    4444libmath_libs="$LIB_DIR/libmath.a"
    4545
    46 libgui_cflags="-I$INCLUDE_DIR/libgui"
    47 libgui_libs="$LIB_DIR/libgui.a"
     46libgui_cflags="-I$INCLUDE_DIR/libgui -I$INCLUDE_DIR/libdisplay -I$INCLUDE_DIR/libgfx -I$INCLUDE_DIR/libipcgfx"
     47libgui_libs="$LIB_DIR/libgui.a $LIB_DIR/libdisplay.a $LIB_DIR/libipcgfx.a $LIB_DIR/libgfx.a"
    4848
    4949libdraw_cflags="-I$INCLUDE_DIR/libdraw"
     
    5555libpcm_cflags="-I$INCLUDE_DIR/libpcm"
    5656libpcm_libs="$LIB_DIR/libpcm.a"
     57
     58libgfx_cflags="-I$INCLUDE_DIR/libgfx"
     59libgfx_libs="$LIB_DIR/libgfx.a"
     60
     61libipcgfx_cflags="-I$INCLUDE_DIR/libipcgfx"
     62libipcgfx_libs="$LIB_DIR/libipcgfx.a"
     63
     64libdisplay_cflags="-I$INCLUDE_DIR/libdisplay"
     65libdisplay_libs="$LIB_DIR/libdisplay.a"
    5766
    5867action=none
     
    7180            (libhound) ;;
    7281            (libpcm) ;;
     82            (libgfx) ;;
     83            (libipcgfx) ;;
     84            (libdisplay) ;;
    7385            (*) echo "Unknown package $1" >&2; exit 1;;
    7486            esac
Note: See TracChangeset for help on using the changeset viewer.