X-Git-Url: https://git.rohieb.name/hackover2013-badge-firmware.git/blobdiff_plain/939510f7e9ec103b7bd1dd10c1fe95a789e97f5d..7b944113aa6de5bd5a63d9ed1855222809d63844:/Makefile

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