Merge commit 'a20ef7052c6e937d2f7672dd59456e55a5c08296' into master_ng

[max/tmk_keyboard.git] / keyboard / hid_liber / Makefile.pjrc

diff --git a/keyboard/hid_liber/Makefile.pjrc b/keyboard/hid_liber/Makefile.pjrc
index ecc236e3d07248799711bc3b00a47b8963d81fcd..326bbe86f566dfae4ca0d9e78dec58a079e18a84 100644 (file)
--- a/keyboard/hid_liber/Makefile.pjrc
+++ b/keyboard/hid_liber/Makefile.pjrc
@@ -39,10 +39,10 @@
 #----------------------------------------------------------------------------
 
 # Target file name (without extension).
-TARGET = macway_pjrc
+TARGET = hid_liber_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../../tmk_core
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -71,25 +71,41 @@ MCU = atmega32u4       # Teensy 2.0
 F_CPU = 16000000
 
 
+# Boot Section Size in bytes
+#   Teensy halfKay   512
+#   Atmel DFU loader 4096
+#   LUFA bootloader  4096
+OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+
 # Build Options
 #   comment out to disable the options.
 #
-MOUSEKEY_ENABLE = yes  # Mouse keys
-#PS2_MOUSE_ENABLE = yes        # PS/2 mouse(TrackPoint) support
-EXTRAKEY_ENABLE = yes  # Audio control and System control
-#NKRO_ENABLE = yes     # USB Nkey Rollover
+BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
+#MOUSEKEY_ENABLE = yes      # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
+CONSOLE_ENABLE = yes        # Console for debug(+400)
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # USB Nkey Rollover - not yet supported in LUFA
+#PS2_MOUSE_ENABLE = yes     # PS/2 mouse(TrackPoint) support
 
 
+# Search Path
+VPATH += $(TARGET_DIR)
+VPATH += $(TMK_DIR)
 
-#---------------- Programming Options --------------------------
-PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
+include $(TMK_DIR)/protocol/pjrc.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk
 
+ansi: OPT_DEFS += -DLAYOUT_ANSI
+ansi: all
 
+iso: OPT_DEFS += -DLAYOUT_ISO
+iso: all
 
-# Search Path
-VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+custom: OPT_DEFS += -DLAYOUT_CUSTOM
+custom: all
 
-include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+alaricljs: OPT_DEFS += -DLAYOUT_ALARICLJS
+alaricljs: all