Starting to get rid of borrowed code (LcdDisplay, Fonts), integrate

[oswald.git] / metawatch / Makefile

diff --git a/metawatch/Makefile b/metawatch/Makefile
index 64ef09f1973ce9082812ac5eeb3470ef433d849e..48a60ce10fb31994621e96e6c8b500b73707be38 100644 (file)
--- a/metawatch/Makefile
+++ b/metawatch/Makefile
@@ -25,8 +25,9 @@ APPCONFIG = -DDIGITAL -DMW_DEVBOARD_V2
 # List all the source files here
 # eg if you have a source file foo.c then list it here
 OSWALD_SRC = ../ui/oswald_main.c ../ui/oswald_screens.c \
-       ../ui/oswald_watch_faces.c ../ui/Fonts.c ../ui/LcdDisplay.c \
+       ../ui/oswald_watch_faces.c \
        ../ui/oswald_strings.c ../ui/calendar.c \
+       ../ui/oswald_graphics.c ../ui/oswald_fonts.c \
        ../ui/embedvm.c
 
 SOURCES = mw_main.c mw_uart.c mw_lcd.c mw_adc.c mw_bt.c \
@@ -41,7 +42,7 @@ SOURCES = mw_main.c mw_uart.c mw_lcd.c mw_adc.c mw_bt.c \
 # Include are located in the Include directory
 #INCLUDES = $(BT_STACK_INC)
 #INCLUDES = $(BT_SMALLTOOTH_INV)
-INCLUDES = -I../ui/ -I../ui/bitmaps/
+INCLUDES = -I../ui/
 
 # Add or subtract whatever MSPGCC flags you want. There are plenty more
 #######################################################################################