aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorPerry Hung <iperry@alum.mit.edu>2010-04-25 18:08:56 -0400
committerPerry Hung <iperry@alum.mit.edu>2010-04-25 18:08:56 -0400
commit62552a6f3f93223682f9df2df2614411f7e3d54c (patch)
tree05f71e01c98ac341c029b2a050b796f1be3de8b5 /Makefile
parent7ea059f945003c90ab56b1e6f762df9ae29ddf3c (diff)
downloadlibrambutan-62552a6f3f93223682f9df2df2614411f7e3d54c.tar.gz
librambutan-62552a6f3f93223682f9df2df2614411f7e3d54c.zip
Refactoring:
The 'core' directory has now been renamed to 'wirish.' Wirish is our version of the Arduino Wiring language.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile62
1 files changed, 31 insertions, 31 deletions
diff --git a/Makefile b/Makefile
index e7df3a5..875e458 100644
--- a/Makefile
+++ b/Makefile
@@ -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