Typo

[hackover2013-badge-firmware.git] / Makefile

diff --git a/Makefile b/Makefile
index d8b61f3..c52e557 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -47,11 +47,11 @@ OBJS += cmd_textw.o cmd_tsthreshhold.o cmd_tswait.o cmd_triangle.o
 ##########################################################################
 
 # Chibi Light-Weight Wireless Stack (AT86RF212)
 ##########################################################################
 
 # Chibi Light-Weight Wireless Stack (AT86RF212)

-VPATH += drivers/chibi
+VPATH += drivers/rf/chibi

 OBJS += chb.o chb_buf.o chb_drvr.o chb_eeprom.o chb_spi.o
 
 # 4K EEPROM
 OBJS += chb.o chb_buf.o chb_drvr.o chb_eeprom.o chb_spi.o
 
 # 4K EEPROM

-VPATH += drivers/eeprom drivers/eeprom/mcp24aa
+VPATH += drivers/storage/eeprom drivers/storage/eeprom/mcp24aa

 OBJS += eeprom.o mcp24aa.o
 
 # LM75B temperature sensor
 OBJS += eeprom.o mcp24aa.o
 
 # LM75B temperature sensor


@@ -63,14 +63,25 @@ VPATH += drivers/rtc/isl12022m
 OBJS += isl12022m.o
 
 # TFT LCD support
 OBJS += isl12022m.o
 
 # TFT LCD support

-VPATH += drivers/displays/tft drivers/displays/tft/hw drivers/displays/tft/fonts
+VPATH += drivers/displays/tft drivers/displays/tft/hw 

 VPATH += drivers/displays/tft/dialogues
 VPATH += drivers/displays/tft/dialogues

-OBJS += drawing.o touchscreen.o bmp.o alphanumeric.o
+OBJS += drawing.o touchscreen.o colors.o bmp.o alphanumeric.o
+
+# Bitmap (non-AA) fonts
+VPATH += drivers/displays/tft/fonts
+OBJS += fonts.o 

 OBJS += dejavusans9.o dejavusansbold9.o dejavusanscondensed9.o
 OBJS += dejavusansmono8.o dejavusansmonobold8.o
 OBJS += verdana9.o verdana14.o verdanabold14.o 
 
 OBJS += dejavusans9.o dejavusansbold9.o dejavusanscondensed9.o
 OBJS += dejavusansmono8.o dejavusansmonobold8.o
 OBJS += verdana9.o verdana14.o verdanabold14.o 
 

+# Anti-aliased fonts
+VPATH += drivers/displays/tft/aafonts/aa2 drivers/displays/tft/aafonts/aa4
+OBJS += aafonts.o 
+OBJS += DejaVuSansCondensed14_AA2.o DejaVuSansCondensedBold14_AA2.o
+OBJS += DejaVuSansMono10_AA2.o DejaVuSansMono13_AA2.o DejaVuSansMono14_AA2.o
+

 # LCD Driver (Only one can be included at a time!)
 # LCD Driver (Only one can be included at a time!)

+# OBJS += hx8340b.o

 OBJS += ILI9328.o
 # OBJS += ILI9325.o
 # OBJS += ssd1331.o
 OBJS += ILI9328.o
 # OBJS += ILI9325.o
 # OBJS += ssd1331.o


@@ -106,7 +117,7 @@ VPATH += drivers/dac/mcp4725
 OBJS += mcp4725.o
 
 # RFID/NFC
 OBJS += mcp4725.o
 
 # RFID/NFC

-VPATH += drivers/sensors/pn532 drivers/sensors/pn532/helpers
+VPATH += drivers/rf/pn532 drivers/rf/pn532/helpers

 OBJS += pn532.o pn532_bus_i2c.o pn532_bus_uart.o
 OBJS += pn532_mifare_classic.o pn532_mifare_ultralight.o
 
 OBJS += pn532.o pn532_bus_i2c.o pn532_bus_uart.o
 OBJS += pn532_mifare_classic.o pn532_mifare_ultralight.o
 


@@ -115,7 +126,7 @@ VPATH += drivers/sensors/tcs3414 drivers/sensors/tsl2561
 OBJS += tcs3414.o tsl2561.o
 
 # SPI Flash
 OBJS += tcs3414.o tsl2561.o
 
 # SPI Flash

-VPATH += drivers/spiflash/w25q16bv
+VPATH += drivers/storage/spiflash/w25q16bv

 OBJS += w25q16bv.o
 
 ##########################################################################
 OBJS += w25q16bv.o
 
 ##########################################################################


@@ -124,10 +135,11 @@ OBJS += w25q16bv.o
 
 VPATH += core core/adc core/cmd core/cpu core/gpio core/i2c core/pmu
 VPATH += core/ssp core/systick core/timer16 core/timer32 core/uart
 
 VPATH += core core/adc core/cmd core/cpu core/gpio core/i2c core/pmu
 VPATH += core/ssp core/systick core/timer16 core/timer32 core/uart

-VPATH += core/usbhid-rom core/libc core/wdt core/usbcdc core/pwm
-VPATH += core/iap
+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 += 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 stdio.o string.o
+OBJS += timer32.o uart.o uart_buf.o usbconfig.o usbhid.o

 OBJS += wdt.o cdcuser.o cdc_buf.o usbcore.o usbdesc.o usbhw.o usbuser.o 
 OBJS += sysinit.o pwm.o iap.o
 
 OBJS += wdt.o cdcuser.o cdc_buf.o usbcore.o usbdesc.o usbhw.o usbuser.o 
 OBJS += sysinit.o pwm.o iap.o