Sprites

[hackover2013-badge-firmware.git] / Makefile

diff --git a/Makefile b/Makefile
index f7c250e..0685d8b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ OBJS += samsung_20T202DA2JA.o
 \r
 # ChaN FatFS and SD card support\r
 VPATH += drivers/fatfs\r
-OBJS += ff.o mmc.o\r
+OBJS += ff.o #mmc.o\r
 \r
 # Motors\r
 VPATH += drivers/motor/stepper\r
@@ -152,6 +152,10 @@ OBJS += ina219.o
 VPATH += drivers/sensors/mpl115a2\r
 OBJS += mpl115a2.o\r
 \r
+# ADS1015 12-bit ADC\r
+VPATH += drivers/adc/ads1015\r
+OBJS += ads1015.o\r
+\r
 ##########################################################################\r
 # Library files \r
 ##########################################################################\r
@@ -162,10 +166,17 @@ VPATH += core/usbhid-rom core/wdt core/usbcdc core/pwm core/iap
 VPATH += core/libc\r
 OBJS += stdio.o string.o\r
 OBJS += adc.o cpu.o cmd.o gpio.o i2c.o pmu.o ssp.o systick.o timer16.o\r
-OBJS += timer32.o uart.o uart_buf.o usbconfig.o usbhid.o\r
+OBJS += timer32.o uart.o uart_buf.o usbconfig.o usbhid.o usbmsc.o\r
 OBJS += wdt.o cdcuser.o cdc_buf.o usbcore.o usbdesc.o usbhw.o usbuser.o \r
 OBJS += sysinit.o pwm.o iap.o\r
 \r
+\r
+VPATH += lcd\r
+OBJS += display.o sprite.o\r
+\r
+VPATH += dataflash\r
+OBJS += at45db041d.o iobase.o diskio.o\r
+\r
 ##########################################################################\r
 # GNU GCC compiler prefix and location\r
 ##########################################################################\r
@@ -208,10 +219,10 @@ OBJS += $(TARGET)_handlers.o LPC1xxx_startup.o
 # Compiler settings, parameters and flags\r
 ##########################################################################\r
 ifeq (TRUE,$(DEBUGBUILD))\r
-  CFLAGS  = -c -g -O0 $(INCLUDE_PATHS) -Wall -mthumb -ffunction-sections -fdata-sections -fmessage-length=0 -mcpu=$(CPU_TYPE) -DTARGET=$(TARGET) -fno-builtin $(OPTDEFINES)\r
+  CFLAGS  = -c -g -O0 $(INCLUDE_PATHS) -Wall -mthumb -ffunction-sections -fdata-sections -fmessage-length=0 -mcpu=$(CPU_TYPE) -DTARGET=$(TARGET) -fno-builtin $(OPTDEFINES) -std=c99\r
   ASFLAGS = -c -g -O0 $(INCLUDE_PATHS) -Wall -mthumb -ffunction-sections -fdata-sections -fmessage-length=0 -mcpu=$(CPU_TYPE) -D__ASSEMBLY__ -x assembler-with-cpp\r
 else\r
-  CFLAGS  = -c -g -Os $(INCLUDE_PATHS) -Wall -mthumb -ffunction-sections -fdata-sections -fmessage-length=0 -mcpu=$(CPU_TYPE) -DTARGET=$(TARGET) -fno-builtin $(OPTDEFINES)\r
+  CFLAGS  = -c -g -Os $(INCLUDE_PATHS) -Wall -mthumb -ffunction-sections -fdata-sections -fmessage-length=0 -mcpu=$(CPU_TYPE) -DTARGET=$(TARGET) -fno-builtin $(OPTDEFINES) -std=c99\r
   ASFLAGS = -c -g -Os $(INCLUDE_PATHS) -Wall -mthumb -ffunction-sections -fdata-sections -fmessage-length=0 -mcpu=$(CPU_TYPE) -D__ASSEMBLY__ -x assembler-with-cpp\r
 endif\r
 \r