diff options
| author | Zach White <skullydazed@gmail.com> | 2021-01-30 13:15:13 -0800 |
|---|---|---|
| committer | Zach White <skullydazed@gmail.com> | 2021-01-30 13:15:13 -0800 |
| commit | 3af97ef6a22eb6a30c3f7c3e8ed008389da896cb (patch) | |
| tree | 1bf6ac87f54df49a844b17f71ee8171f6aeee790 /build_keyboard.mk | |
| parent | 051c0774f8663e6090392b691ce0afc8c3a0574f (diff) | |
| parent | d02c4c5241b92396c883b9efa6f140236e74fa2d (diff) | |
| download | qmk_firmware-3af97ef6a22eb6a30c3f7c3e8ed008389da896cb.tar.gz qmk_firmware-3af97ef6a22eb6a30c3f7c3e8ed008389da896cb.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'build_keyboard.mk')
| -rw-r--r-- | build_keyboard.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index 6d54e3844..b2a152bb9 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk | |||
| @@ -317,6 +317,9 @@ ifneq ("$(wildcard $(USER_PATH)/post_config.h)","") | |||
| 317 | POST_CONFIG_H += $(USER_PATH)/post_config.h | 317 | POST_CONFIG_H += $(USER_PATH)/post_config.h |
| 318 | endif | 318 | endif |
| 319 | 319 | ||
| 320 | # Disable features that a keyboard doesn't support | ||
| 321 | -include disable_features.mk | ||
| 322 | |||
| 320 | # Object files directory | 323 | # Object files directory |
| 321 | # To put object files in current directory, use a dot (.), do NOT make | 324 | # To put object files in current directory, use a dot (.), do NOT make |
| 322 | # this an empty or blank macro! | 325 | # this an empty or blank macro! |