Rework font code, add new fonts, also proportional, rework watch usage - "SET" button...

[oswald.git] / metawatch / Makefile

diff --git a/metawatch/Makefile b/metawatch/Makefile
index 48a60ce10fb31994621e96e6c8b500b73707be38..e2302113dfa9e578aa4be96c856eca2ae1b341bc 100644 (file)
--- a/metawatch/Makefile
+++ b/metawatch/Makefile
@@ -17,13 +17,17 @@ MEMMODEL   = -mmemory-model=huge -fdata-sections -ffunction-sections # -mdata-re
 # MEMMODEL   = -mmemory-model=medium -misr20
 #MEMMODEL   = -mmemory-model=medium
 
-APPCONFIG = -DDIGITAL -DMW_DEVBOARD_V2
+#APPCONFIG = -DDIGITAL -DMW_DEVBOARD_V2
 #APPCONFIG = -DDIGITAL -DMW_DEVBOARD_V2 -DWITH_BTSTACK
 #APPCONFIG = -DDIGITAL -DMW_DEVBOARD_V2 -DCC256x_TRANSP
-#APPCONFIG = -DDIGITAL -DMW_DIGITAL_V2
+APPCONFIG = -DDIGITAL -DMW_DIGITAL_V2
 
 # List all the source files here
 # eg if you have a source file foo.c then list it here
+
+BTCC256x_SCRIPT = bluetooth_init_cc2560_2.44.c
+#BTCC256x_SCRIPT = bluetooth_init_cc2564_2.8.c
+
 OSWALD_SRC = ../ui/oswald_main.c ../ui/oswald_screens.c \
        ../ui/oswald_watch_faces.c \
        ../ui/oswald_strings.c ../ui/calendar.c \
@@ -31,7 +35,7 @@ OSWALD_SRC = ../ui/oswald_main.c ../ui/oswald_screens.c \
        ../ui/embedvm.c
 
 SOURCES = mw_main.c mw_uart.c mw_lcd.c mw_adc.c mw_bt.c \
-       bluetooth_init_cc2560_2.44.c \
+       mw_acc.c $(BTCC256x_SCRIPT) \
        bt_hci.c bt_l2cap.c \
        oswald_hal.c $(OSWALD_SRC)
 #      $(BT_SMALLTOOTH_SRC)