diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 30 |
1 files changed, 14 insertions, 16 deletions
@@ -29,16 +29,16 @@ LIB_PATH = libmaple OUTDIRS = $(BUILD_PATH)/$(LIB_PATH)\ $(BUILD_PATH)/wirish \ $(BUILD_PATH)/wirish/comm \ - $(BUILD_PATH)/wirish/usb \ - $(BUILD_PATH)/wirish/usb_lib + $(BUILD_PATH)/$(LIB_PATH)/usb \ + $(BUILD_PATH)/$(LIB_PATH)/usb/usb_lib INCLUDES = -I$(LIB_PATH) \ -I./ \ -Iwirish \ -Iwirish/comm \ - -Iwirish/usb \ - -Iwirish/usb_lib + -I$(LIB_PATH)/usb \ + -I$(LIB_PATH)/usb/usb_lib # default is to upload to flash #DEFFLAGS = VECT_TAB_BASE @@ -71,7 +71,6 @@ CSRC = libmaple/systick.c \ libmaple/nvic.c \ libmaple/usart.c \ libmaple/util.c \ - libmaple/usb.c \ libmaple/rcc.c \ libmaple/flash.c \ libmaple/spi.c \ @@ -81,21 +80,20 @@ CSRC = libmaple/systick.c \ wirish/time.c \ wirish/pwm.c \ wirish/ext_interrupts.c \ - wirish/wirish_digital.c - wirish/usb/usb.c \ - wirish/usb/usb_callbacks.c \ - wirish/usb/usb_hardware.c \ - wirish/usb/descriptors.c \ - wirish/usb/usb_lib/usb_core.c \ - wirish/usb/usb_lib/usb_init.c \ - wirish/usb/usb_lib/usb_int.c \ - wirish/usb/usb_lib/usb_mem.c \ - wirish/usb/usb_lib/usb_regs.c \ + wirish/wirish_digital.c \ + libmaple/usb/usb.c \ + libmaple/usb/usb_callbacks.c \ + libmaple/usb/usb_hardware.c \ + libmaple/usb/descriptors.c \ + libmaple/usb/usb_lib/usb_core.c \ + libmaple/usb/usb_lib/usb_init.c \ + libmaple/usb/usb_lib/usb_int.c \ + libmaple/usb/usb_lib/usb_mem.c \ + libmaple/usb/usb_lib/usb_regs.c \ CPPSRC = wirish/wirish_math.cpp \ wirish/Print.cpp \ wirish/comm/HardwareSerial.cpp \ - wirish/comm/HardwareUsb.cpp \ wirish/comm/HardwareSPI.cpp \ wirish/cxxabi-compat.cpp \ |