diff options
author | Perry Hung <iperry@alum.mit.edu> | 2010-04-25 18:14:43 -0400 |
---|---|---|
committer | Perry Hung <iperry@alum.mit.edu> | 2010-04-25 18:14:43 -0400 |
commit | 4ccbeb08e64b6bc7cee1f54a04001eff778b4282 (patch) | |
tree | 05f71e01c98ac341c029b2a050b796f1be3de8b5 /Makefile | |
parent | b41eb846ca60559cff242d0c550699eb8f309909 (diff) | |
parent | 62552a6f3f93223682f9df2df2614411f7e3d54c (diff) | |
download | librambutan-4ccbeb08e64b6bc7cee1f54a04001eff778b4282.tar.gz librambutan-4ccbeb08e64b6bc7cee1f54a04001eff778b4282.zip |
Merge branch 'master' into spi
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 62 |
1 files changed, 31 insertions, 31 deletions
@@ -27,14 +27,14 @@ BUILD_PATH = build LIB_PATH = libmaple OUTDIRS = $(BUILD_PATH)/$(LIB_PATH)\ - $(BUILD_PATH)/core \ - $(BUILD_PATH)/core/comm + $(BUILD_PATH)/wirish \ + $(BUILD_PATH)/wirish/comm INCLUDES = -I$(LIB_PATH) \ -I./ \ - -Icore \ - -Icore/comm + -Iwirish \ + -Iwirish/comm # default is to upload to flash #DEFFLAGS = VECT_TAB_BASE @@ -57,33 +57,33 @@ ODFLAGS = -S # main source file MAIN=main.c -CSRC = libmaple/systick.c \ - libmaple/timers.c \ - libmaple/adc.c \ - libmaple/syscalls.c \ - libmaple/exc.c \ - libmaple/exti.c \ - libmaple/gpio.c \ - libmaple/nvic.c \ - libmaple/usart.c \ - libmaple/util.c \ - libmaple/usb.c \ - libmaple/rcc.c \ - libmaple/flash.c \ - libmaple/spi.c \ - core/wiring.c \ - core/wiring_shift.c \ - core/wiring_analog.c \ - core/time.c \ - core/pwm.c \ - core/ext_interrupts.c \ - core/wiring_digital.c - -CPPSRC = core/wiring_math.cpp \ - core/Print.cpp \ - core/comm/HardwareSerial.cpp \ - core/comm/HardwareUsb.cpp \ - core/comm/HardwareSPI.cpp \ +CSRC = libmaple/systick.c \ + libmaple/timers.c \ + libmaple/adc.c \ + libmaple/syscalls.c \ + libmaple/exc.c \ + libmaple/exti.c \ + libmaple/gpio.c \ + libmaple/nvic.c \ + libmaple/usart.c \ + libmaple/util.c \ + libmaple/usb.c \ + libmaple/rcc.c \ + libmaple/flash.c \ + libmaple/spi.c \ + wirish/wirish.c \ + wirish/wirish_shift.c \ + wirish/wirish_analog.c \ + wirish/time.c \ + wirish/pwm.c \ + wirish/ext_interrupts.c \ + wirish/wirish_digital.c + +CPPSRC = wirish/wirish_math.cpp \ + wirish/Print.cpp \ + wirish/comm/HardwareSerial.cpp \ + wirish/comm/HardwareUsb.cpp \ + wirish/comm/HardwareSPI.cpp \ main.cpp # i really have no idea what i'm doing |