Changeset 4a7a8d4 in mainline for uspace/Makefile


Ignore:
Timestamp:
2011-05-13T10:31:54Z (13 years ago)
Author:
Matus Dekanek <smekideki@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
aca3489
Parents:
05e21ffc (diff), c372e03 (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 with usb/development

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r05e21ffc r4a7a8d4  
    179179ifeq ($(UARCH),amd64)
    180180        LIBS += lib/usb
     181        LIBS += lib/usbhost
     182        LIBS += lib/usbdev
     183        LIBS += lib/usbhid
    181184        LIBS += lib/usbvirt
    182185endif
    … …  
    184187ifeq ($(UARCH),ia32)
    185188        LIBS += lib/usb
     189        LIBS += lib/usbhost
     190        LIBS += lib/usbdev
     191        LIBS += lib/usbhid
    186192        LIBS += lib/usbvirt
    187193endif
Note: See TracChangeset for help on using the changeset viewer.