diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-08-23 22:29:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-23 22:29:07 -0400 |
| commit | d2ff66a985b938e87fffe55c1d9f1dc55e356f91 (patch) | |
| tree | 561b3e203033849573a17f5ac6248077ab687676 /build_keyboard.mk | |
| parent | 7260fc3eef98fb7b0e2ed24d3d0d14cf2e613000 (diff) | |
| download | qmk_firmware-d2ff66a985b938e87fffe55c1d9f1dc55e356f91.tar.gz qmk_firmware-d2ff66a985b938e87fffe55c1d9f1dc55e356f91.zip | |
Creates a layouts/ folder for keymaps shared between keyboards (#1609)
* include variables and .h files as pp directives
* start layout compilation
* split ergodoxes up
* don't compile all layouts for everything
* might seg fault
* reset layouts variable
* actually reset layouts
* include rules.mk instead
* remove includes from rules.mk
* update variable setting
* load visualizer from path
* adds some more examples
* adds more layouts
* more boards added
* more boards added
* adds documentation for layouts
* use lowercase names for LAYOUT_
* add layout.json files for each layout
* add community folder, default keymaps for layouts
* touch-up default layouts
* touch-up layouts, some keyboard rules.mk
* update documentation for layouts
* fix up serial/i2c switches
Diffstat (limited to 'build_keyboard.mk')
| -rw-r--r-- | build_keyboard.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index 3ec389ac9f..e8e21f2ba1 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -39,6 +39,7 @@ ifneq ("$(wildcard $(KEYBOARD_C))","") else $(error "$(KEYBOARD_C)" does not exist) endif +OPT_DEFS += -DKEYBOARD_$(KEYBOARD) ifneq ($(SUBPROJECT),) SUBPROJECT_PATH := keyboards/$(KEYBOARD)/$(SUBPROJECT) @@ -97,11 +98,13 @@ else ifneq ("$(wildcard $(MAIN_KEYMAP_C))","") -include $(MAIN_KEYMAP_PATH)/Makefile KEYMAP_C := $(MAIN_KEYMAP_C) KEYMAP_PATH := $(MAIN_KEYMAP_PATH) +else ifneq ($(LAYOUTS),) + include build_layout.mk else - $(error "$(MAIN_KEYMAP_C)/keymap.c" does not exist) + $(error Could not find keymap) + # this state should never be reached endif - # Object files directory # To put object files in current directory, use a dot (.), do NOT make # this an empty or blank macro! @@ -157,7 +160,10 @@ endif OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT) $(KEYMAP_OUTPUT)_SRC := $(SRC) -$(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) $(GFXDEFS) -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\" +$(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) $(GFXDEFS) \ +-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(KEYBOARD).h\" -DQMK_KEYBOARD_CONFIG_H=\"$(KEYBOARD_PATH)/config.h\" \ +-DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \ +-DQMK_SUBPROJECT=\"$(SUBPROJECT)\" -DQMK_SUBPROJECT_H=\"$(SUBPROJECT).h\" -DQMK_SUBPROJECT_CONFIG_H=\"$(SUBPROJECT_PATH)/config.h\" $(KEYMAP_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H) $(KEYBOARD_OUTPUT)_SRC := $(CHIBISRC) $(GFXSRC) |