diff options
| author | dakkar <dakkar@thenautilus.net> | 2019-02-07 17:47:17 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2019-02-07 17:47:17 +0000 |
| commit | fce5281fd6f82d22d34c2d4532dadf1d6940a09d (patch) | |
| tree | 6da450508a51cca5221e3eb861ef7eb2b17da477 | |
| parent | disable boot protocol as well (diff) | |
| download | keyboardio-model01-fce5281fd6f82d22d34c2d4532dadf1d6940a09d.tar.gz keyboardio-model01-fce5281fd6f82d22d34c2d4532dadf1d6940a09d.tar.bz2 keyboardio-model01-fce5281fd6f82d22d34c2d4532dadf1d6940a09d.zip | |
fix makefile after rebasing
| -rw-r--r-- | Makefile | 57 |
1 files changed, 7 insertions, 50 deletions
@@ -1,57 +1,14 @@ -# This stub makefile for a Kaleidoscope plugin pulls in -# all targets from the Kaleidoscope-Plugin library - UNAME_S := $(shell uname -s) -ifeq ($(UNAME_S),Darwin) -SKETCHBOOK_DIR ?= $(HOME)/Documents/Arduino -PACKAGE_DIR ?= $(HOME)/Library/Arduino15 -else -SKETCHBOOK_DIR ?= $(HOME)/Arduino -PACKAGE_DIR ?= $(HOME)/.arduino15 -endif - - -ARDUINO_INSTALLED_ENV=$(shell ls -dt $(PACKAGE_DIR)/packages/keyboardio/hardware/avr 2>/dev/null |head -n 1) -MANUALLY_INSTALLED_ENV=$(shell ls -dt $(SKETCHBOOK_DIR)/hardware/keyboardio/avr 2>/dev/null |head -n 1) - - - -ifneq ("$(wildcard $(ARDUINO_INSTALLED_ENV)/boards.txt)","") - -ifneq ("$(wildcard $(MANUALLY_INSTALLED_ENV)/boards.txt)","") - -$(info ***************************************************************************) -$(info It appears that you have installed two copies of Kaleidoscope. One copy was) -$(info installed using Arduino's "Board Manager", while the other was installed by) -$(info hand, probably using "git".) -$(info ) -$(info This will likely cause some trouble as you try to build keyboard firmware) -$(info using Kaleidoscope. You may want to remove either: ) -$(info ) -$(info $(PACKAGE_DIR)/packages/keyboardio/ which was installed using Arduino) -$(info ) -$(info or) -$(info ) -$(info $(SKETCHBOOK_DIR)/hardware/keyboardio/ which was installed by hand.) -$(info ) -$(info ***************************************************************************) -$(info ) - -endif - -BOARD_HARDWARE_PATH = $(ARDUINO_INSTALLED_ENV) -KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR ?= build-tools/makefiles/ -KALEIDOSCOPE_BUILDER_DIR ?= $(ARDUINO_INSTALLED_ENV)/libraries/Kaleidoscope/bin/ - - - -endif +export ARDUINO_PATH = /home/dakkar/HW/KeyboardIO/arduino-1.8.7 +export SKETCHBOOK_DIR = /home/dakkar/HW/KeyboardIO +export PACKAGE_DIR = /home/dakkar/HW/KeyboardIO/built +KALEIDOSCOPE_BUILDER_DIR = $(SKETCHBOOK_DIR)/hardware/keyboardio/avr/libraries/Kaleidoscope/bin/ -BOARD_HARDWARE_PATH ?= $(SKETCHBOOK_DIR)/hardware -KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR ?= keyboardio/avr/build-tools/makefiles/ +BOARD_HARDWARE_PATH = $(SKETCHBOOK_DIR)/hardware +KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR = keyboardio/avr/build-tools/makefiles/ -export LOCAL_CFLAGS= -DKALEIDOSCOPE_HIDADAPTOR_DISABLE_ABSOLUTE_MOUSE=1 -DKALEIDOSCOPE_HIDADAPTOR_DISABLE_MOUSE=1 -DKALEIDOSCOPE_HIDADAPTOR_DISABLE_KEYBOARD_BOOT_PROTOCOL=1 +# export LOCAL_CFLAGS= -DKALEIDOSCOPE_HIDADAPTOR_DISABLE_ABSOLUTE_MOUSE=1 -DKALEIDOSCOPE_HIDADAPTOR_DISABLE_MOUSE=1 -DKALEIDOSCOPE_HIDADAPTOR_DISABLE_KEYBOARD_BOOT_PROTOCOL=1 include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk |