Changeset 140e21a in mainline


Ignore:
Timestamp:
2020-11-16T18:13:09Z (3 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2e0a2e7
Parents:
6d527cff
Message:

Update export.sh and helenos-pkg-config

Location:
tools
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • tools/export.sh

    r6d527cff r140e21a  
    3939
    4040EXPORT_LIBS=" \
    41         uspace/lib/libmath.a \
     41        uspace/lib/c/libstartfiles.a \
    4242        uspace/lib/libclui.a \
     43        uspace/lib/libc.a \
     44        uspace/lib/libcpp.a \
    4345        uspace/lib/libdisplay.a \
    4446        uspace/lib/libgfx.a \
    45         uspace/lib/libgui.a \
     47        uspace/lib/libgfximage.a \
     48        uspace/lib/libhound.a \
    4649        uspace/lib/libipcgfx.a \
    47         uspace/lib/libdraw.a \
    48         uspace/lib/libsoftrend.a \
    49         uspace/lib/libhound.a \
     50        uspace/lib/libmath.a \
    5051        uspace/lib/libpcm.a \
    51         uspace/lib/libcpp.a \
    52         uspace/lib/libc.a \
    53         uspace/lib/c/libstartfiles.a \
     52        uspace/lib/libpixconv.a \
    5453        uspace/lib/libposix.a \
     54        uspace/lib/libui.a \
    5555"
    5656

  • tools/xcw/bin/helenos-pkg-config

    r6d527cff r140e21a  
    11#!/bin/bash
    22#
    3 # Copyright (c) 2015 Jiri Svoboda
     3# Copyright (c) 2020 Jiri Svoboda
    44# All rights reserved.
    55#
    … …  
    4444libmath_libs="$LIB_DIR/libmath.a"
    4545
    46 libgui_cflags="-I$INCLUDE_DIR/libgui -I$INCLUDE_DIR/libdisplay -I$INCLUDE_DIR/libgfx -I$INCLUDE_DIR/libipcgfx"
    47 libgui_libs="$LIB_DIR/libgui.a $LIB_DIR/libdisplay.a $LIB_DIR/libipcgfx.a $LIB_DIR/libgfx.a"
     46libui_cflags="-I$INCLUDE_DIR/libui -I$INCLUDE_DIR/libdisplay -I$INCLUDE_DIR/libgfx -I$INCLUDE_DIR/libipcgfx"
     47libui_libs="$LIB_DIR/libui.a $LIB_DIR/libdisplay.a $LIB_DIR/libipcgfx.a $LIB_DIR/libgfx.a"
    4848
    49 libdraw_cflags="-I$INCLUDE_DIR/libdraw"
    50 libdraw_libs="$LIB_DIR/libdraw.a $LIB_DIR/libsoftrend.a"
     49libgfximage_cflags="-I$INCLUDE_DIR/libgfximage"
     50libgfximage_libs="$LIB_DIR/libgfximage.a $LIB_DIR/libpixconv.a"
    5151
    5252libhound_cflags="-I$INCLUDE_DIR/libhound"
    … …  
    7575        (.*)
    7676            case "$1" in
    77             (libgui) ;;
    78             (libdraw) ;;
     77            (libui) ;;
     78            (libgfximage) ;;
    7979            (libmath) ;;
    8080            (libhound) ;;
Note: See TracChangeset for help on using the changeset viewer.