X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=CMakeLists.txt;h=1f14bbdc58c2133fce4766aed058e715facf242b;hb=6dfeffd9cad508817757d1afaba4ab0901cc9786;hp=f0b6f3030d4808e7fae587ca878b3a7796244f0f;hpb=22abefcf1ee2d2310c64d68aafe274ed351f6dd8;p=kiibohd-controller.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0b6f30..1f14bbd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 ###| CMAKE Kiibohd Controller |###
 #
-# Jacob Alexander 2011-2014
+# Jacob Alexander 2011-2015
 # Due to this file's usefulness:
 #
 # Released into the Public Domain
@@ -17,17 +17,32 @@
 #| You _MUST_ clean the build directory if you change this value
 #|
 set( CHIP
-#	"at90usb162"       # Teensy   1.0 (avr)
-#	"atmega32u4"       # Teensy   2.0 (avr)
-#	"at90usb646"       # Teensy++ 1.0 (avr)
-#	"at90usb1286"      # Teensy++ 2.0 (avr)
-#	"mk20dx128"        # Teensy   3.0 (arm)
-	"mk20dx128vlf5"    # McHCK    mk20dx128vlf5
-#	"mk20dx256"        # Teensy   3.1 (arm)
+#       "at90usb162"       # Teensy   1.0 (avr)
+#       "atmega32u4"       # Teensy   2.0 (avr)
+#       "at90usb646"       # Teensy++ 1.0 (avr)
+#       "at90usb1286"      # Teensy++ 2.0 (avr)
+#       "mk20dx128"        # Teensy   3.0 (arm)
+	"mk20dx128vlf5"    # McHCK       mk20dx128vlf5
+#       "mk20dx256"        # Teensy   3.1 (arm)
+#       "mk20dx256vlh7"    # Kiibohd-dfu mk20dx256vlh7
 	CACHE STRING "Microcontroller Chip" )
 
 
 
+###
+# Compiler Selection
+#
+
+#| *** EXPERIMENTAL ***
+#| Stick with gcc unless you know what you're doing
+#| Currently only arm is supported with clang
+set( COMPILER
+	"gcc"   # arm-none-eabi-gcc / avr-gcc - Default
+#       "clang" # arm-none-eabi
+	CACHE STRING "Compiler Type" )
+
+
+
 ###
 # Compiler Intialization
 #
@@ -91,15 +106,13 @@ set(  DebugModule "full"
 
 ##| Set the base keyboard .kll map, defaults to "defaultMap" if not found
 ##| Looks in Scan/<Module Name> for the available BaseMaps
-##| TODO Support layering in basemap
 set(     BaseMap "defaultMap"
 	CACHE STRING "KLL BaseMap/Scancode Keymapping" )
 
 ##| Layer additonal .kll maps on the BaseMap, layers are in order from 1st to nth
 ##| Can be set to ""
-set(  DefaultMap "stdFuncMap"
+set(  DefaultMap "md1Overlay stdFuncMap"
 	CACHE STRING "KLL DefaultMap" )
-#set(  DefaultMap "colemak stdFuncMap" CACHE )
 
 ##| ParitalMaps available on top of the BaseMap. See above for syntax on specifying multiple layers vs. layering
 ##| Can be set to ""