diff options
| author | Fred Sundvik <fsundvik@gmail.com> | 2016-08-27 20:01:46 +0200 |
|---|---|---|
| committer | Fred Sundvik <fsundvik@gmail.com> | 2016-08-27 20:01:46 +0200 |
| commit | cff26bc48413ec62d4f4a37e3a6ba34721e7670c (patch) | |
| tree | 84c78137841ad83036de7e36579bc7973b024f7a /keyboards/ergodox/Makefile | |
| parent | a5b1af4999345239df5086351b52a5b4d2daa97e (diff) | |
| parent | 36b6a96596e6cbca879d5304a586e279c15b04a9 (diff) | |
| download | qmk_firmware-cff26bc48413ec62d4f4a37e3a6ba34721e7670c.tar.gz qmk_firmware-cff26bc48413ec62d4f4a37e3a6ba34721e7670c.tar.xz | |
Merge branch 'master' into fix_line_endings
Diffstat (limited to 'keyboards/ergodox/Makefile')
| -rw-r--r-- | keyboards/ergodox/Makefile | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/keyboards/ergodox/Makefile b/keyboards/ergodox/Makefile index 05fb588d1..716535005 100644 --- a/keyboards/ergodox/Makefile +++ b/keyboards/ergodox/Makefile @@ -1,34 +1,5 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make = Make software. -# -# make clean = Clean out built project files. -# -# That's pretty much all you need. To compile, always go make clean, -# followed by make. -# -# For advanced users only: -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -#---------------------------------------------------------------------------- SUBPROJECT_DEFAULT = ez -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) -EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) -CONSOLE_ENABLE ?= no # Console for debug(+400) -COMMAND_ENABLE ?= yes # Commands for debug and configuration -CUSTOM_MATRIX ?= yes # Custom matrix file for the ErgoDox EZ -SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend -NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -MIDI_ENABLE ?= no # MIDI controls -UNICODE_ENABLE ?= yes # Unicode - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile -endif +endif
\ No newline at end of file |