Changeset b0b4592e in mainline for uspace/app/vdemo/Makefile


Ignore:
Timestamp:
2014-03-15T19:21:53Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c773adc
Parents:
2034f98 (diff), 8cffdf5 (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 mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/vdemo/Makefile

    r2034f98 rb0b4592e  
    2828
    2929USPACE_PREFIX = ../..
    30 LIBS = $(LIBGUI_PREFIX)/libgui.a $(LIBDRAW_PREFIX)/libdraw.a \
    31         $(LIBSOFTREND_PREFIX)/libsoftrend.a $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
    32 EXTRA_CFLAGS += -I$(LIBGUI_PREFIX) -I$(LIBDRAW_PREFIX) \
     30
     31LIBS = \
     32        $(LIBGUI_PREFIX)/libgui.a \
     33        $(LIBDRAW_PREFIX)/libdraw.a \
     34        $(LIBSOFTREND_PREFIX)/libsoftrend.a \
     35        $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
     36
     37EXTRA_CFLAGS += \
     38        -I$(LIBGUI_PREFIX) \
     39        -I$(LIBDRAW_PREFIX) \
    3340        -I$(LIBSOFTREND_PREFIX)
     41
    3442BINARY = vdemo
     43MATH = y
    3544
    3645SOURCES = \
Note: See TracChangeset for help on using the changeset viewer.