Merge branch 'master' of gitlab:wintermute/hackover2013-badge-firmware

[hackover2013-badge-firmware.git] / Makefile

diff --git a/Makefile b/Makefile
index b6d9f6a..a989b7c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,8 +31,9 @@ OPTDEFINES = -D __NEWLIB__ -DHOB_REV2
 ##########################################################################\r
 \r
 SRCS = \\r
 ##########################################################################\r
 \r
 SRCS = \\r

-  badge/main.c \\r
+  badge/fahrplan.c \\r

   badge/init.c \\r
   badge/init.c \\r

+  badge/main.c \\r

   badge/jumpnrun/collision.c \\r
   badge/jumpnrun/enemies.c \\r
   badge/jumpnrun/game_state.c \\r
   badge/jumpnrun/collision.c \\r
   badge/jumpnrun/enemies.c \\r
   badge/jumpnrun/game_state.c \\r


@@ -45,11 +46,13 @@ SRCS = \
   badge/jumpnrun/starter.c \\r
   badge/jumpnrun/stats.c \\r
   badge/jumpnrun/tiles.c \\r
   badge/jumpnrun/starter.c \\r
   badge/jumpnrun/stats.c \\r
   badge/jumpnrun/tiles.c \\r

+  badge/ui/browser.c \\r

   badge/ui/display.c \\r
   badge/ui/event.c \\r
   badge/ui/font.c \\r
   badge/ui/menu.c \\r
   badge/ui/display.c \\r
   badge/ui/event.c \\r
   badge/ui/font.c \\r
   badge/ui/menu.c \\r

-  badge/ui/sprite.c\r
+  badge/ui/sprite.c \\r
+  badge/ui/vanity.c\r

 \r
 SRCS += \\r
   dataflash/iobase.c \\r
 \r
 SRCS += \\r
   dataflash/iobase.c \\r