diff options
author | Daniel <danielallendeutsch@gmail.com> | 2016-09-01 06:15:47 +0200 |
---|---|---|
committer | Daniel <danielallendeutsch@gmail.com> | 2016-09-01 06:15:47 +0200 |
commit | dbac9f495469854fb64a424b171235e46161d799 (patch) | |
tree | 8c1b5d5b6e287fdedc5092383333b2ddb44bc4f4 /keyboards/ergodox/Makefile | |
parent | 8019a074cfe39e2bf04c35bb5fb40c9ff9cda9a4 (diff) | |
parent | e28d151a8a1d458f3c18897c6095decc17b0c3a1 (diff) | |
download | qmk_firmware-dbac9f495469854fb64a424b171235e46161d799.tar.gz qmk_firmware-dbac9f495469854fb64a424b171235e46161d799.tar.xz |
Merge remote-tracking branch 'upstream/master'
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 |