summaryrefslogtreecommitdiff
path: root/keyboards/lets_split
diff options
context:
space:
mode:
authorAlex Ong <the.onga@gmail.com>2019-01-26 12:13:19 +1100
committerAlex Ong <the.onga@gmail.com>2019-01-26 12:13:19 +1100
commitc9ba618654417ec115809a031d315f8327c79ad4 (patch)
treecd5b907af5bebde7062897ff847e473232ed1214 /keyboards/lets_split
parent2bb2977c133646c4e056960e72029270d77cc1eb (diff)
parentd977daa8dc9136746425f9e1414e1f93cb161877 (diff)
downloadqmk_firmware-c9ba618654417ec115809a031d315f8327c79ad4.tar.gz
qmk_firmware-c9ba618654417ec115809a031d315f8327c79ad4.zip
DO NOT USE Merge branch 'master' into debounce_refactor
Merged, however now there are two debounce.h and debounce.c to mess around with and coalesce. # Conflicts: # quantum/matrix.c
Diffstat (limited to 'keyboards/lets_split')
-rwxr-xr-xkeyboards/lets_split/keymaps/bbaserdem/rules.mk3
-rwxr-xr-xkeyboards/lets_split/keymaps/bbaserdem_right/rules.mk3
-rw-r--r--keyboards/lets_split/keymaps/cpeters1982/rules.mk9
-rw-r--r--keyboards/lets_split/keymaps/fabian/rules.mk3
-rw-r--r--keyboards/lets_split/keymaps/heartrobotninja/rules.mk3
-rw-r--r--keyboards/lets_split/keymaps/khord/rules.mk3
-rw-r--r--keyboards/lets_split/keymaps/mbsurfer/rules.mk3
-rw-r--r--keyboards/lets_split/keymaps/mjt/rules.mk3
-rw-r--r--keyboards/lets_split/keymaps/mtdjr/rules.mk5
-rw-r--r--keyboards/lets_split/keymaps/pitty/rules.mk3
-rw-r--r--keyboards/lets_split/keymaps/poker/rules.mk3
-rw-r--r--keyboards/lets_split/keymaps/waples/rules.mk3
-rw-r--r--keyboards/lets_split/keymaps/xk/rules.mk3
-rw-r--r--keyboards/lets_split/keymaps/zer09/rules.mk3
-rw-r--r--keyboards/lets_split/sockets/config.h9
-rw-r--r--keyboards/lets_split/sockets/rules.mk2
16 files changed, 14 insertions, 47 deletions
diff --git a/keyboards/lets_split/keymaps/bbaserdem/rules.mk b/keyboards/lets_split/keymaps/bbaserdem/rules.mk
index 4159db3fee..7a37e989d8 100755
--- a/keyboards/lets_split/keymaps/bbaserdem/rules.mk
+++ b/keyboards/lets_split/keymaps/bbaserdem/rules.mk
@@ -6,6 +6,3 @@ RGBLIGHT_ENABLE = yes # LED strips
TAP_DANCE_ENABLE = no # Use multi-tap features
AUDIO_ENABLE = no # Audio stuff
-ifndef QUANTUM_DIR
- include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk b/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk
index 36b4b8fc25..d0b6920610 100755
--- a/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk
+++ b/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk
@@ -21,6 +21,3 @@ KEY_LOCK_ENABLE = no # Allows locking any key. Not used
UNICODE_ENABLE = no # Used for unicode character emulation
EXTRAKEY_ENABLE = no # OS signals like volume control
-ifndef QUANTUM_DIR
- include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/cpeters1982/rules.mk b/keyboards/lets_split/keymaps/cpeters1982/rules.mk
index f2fde785d4..87136eef03 100644
--- a/keyboards/lets_split/keymaps/cpeters1982/rules.mk
+++ b/keyboards/lets_split/keymaps/cpeters1982/rules.mk
@@ -1,8 +1,3 @@
+AUTO_SHIFT_ENABLE = yes
+RGBLIGHT_ENABLE = yes
-
-
-ifndef QUANTUM_DIR
- include ../../../../Makefile
- AUTO_SHIFT_ENABLE = yes
- RGBLIGHT_ENABLE = yes
-endif
diff --git a/keyboards/lets_split/keymaps/fabian/rules.mk b/keyboards/lets_split/keymaps/fabian/rules.mk
index b8c82cb99d..316a4b9cbf 100644
--- a/keyboards/lets_split/keymaps/fabian/rules.mk
+++ b/keyboards/lets_split/keymaps/fabian/rules.mk
@@ -4,6 +4,3 @@
#
# UNICODE_ENABLE = yes
-ifndef QUANTUM_DIR
- include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/heartrobotninja/rules.mk b/keyboards/lets_split/keymaps/heartrobotninja/rules.mk
index 36f5e5b6d5..21aae31dba 100644
--- a/keyboards/lets_split/keymaps/heartrobotninja/rules.mk
+++ b/keyboards/lets_split/keymaps/heartrobotninja/rules.mk
@@ -20,6 +20,3 @@ SWAP_HANDS_ENABLE = no # Enable one-hand typing
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
- include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/khord/rules.mk b/keyboards/lets_split/keymaps/khord/rules.mk
index c90523e5d6..32b6edc121 100644
--- a/keyboards/lets_split/keymaps/khord/rules.mk
+++ b/keyboards/lets_split/keymaps/khord/rules.mk
@@ -2,6 +2,3 @@ TAP_DANCE_ENABLE = yes
RGBLIGHT_ENABLE = yes
USE_I2C = no
-ifndef QUANTUM_DIR
- include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/mbsurfer/rules.mk b/keyboards/lets_split/keymaps/mbsurfer/rules.mk
index c90523e5d6..32b6edc121 100644
--- a/keyboards/lets_split/keymaps/mbsurfer/rules.mk
+++ b/keyboards/lets_split/keymaps/mbsurfer/rules.mk
@@ -2,6 +2,3 @@ TAP_DANCE_ENABLE = yes
RGBLIGHT_ENABLE = yes
USE_I2C = no
-ifndef QUANTUM_DIR
- include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/mjt/rules.mk b/keyboards/lets_split/keymaps/mjt/rules.mk
index a14e84d4e5..a43a9a1daa 100644
--- a/keyboards/lets_split/keymaps/mjt/rules.mk
+++ b/keyboards/lets_split/keymaps/mjt/rules.mk
@@ -20,6 +20,3 @@ SWAP_HANDS_ENABLE = no # Enable one-hand typing
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
- include ../../../../Makefile
-endif \ No newline at end of file
diff --git a/keyboards/lets_split/keymaps/mtdjr/rules.mk b/keyboards/lets_split/keymaps/mtdjr/rules.mk
index 75e9c6503e..a81250cdf6 100644
--- a/keyboards/lets_split/keymaps/mtdjr/rules.mk
+++ b/keyboards/lets_split/keymaps/mtdjr/rules.mk
@@ -1,5 +1,2 @@
-ifndef QUANTUM_DIR
- include ../../../../Makefile
-endif
-
RGBLIGHT_ENABLE = yes
+
diff --git a/keyboards/lets_split/keymaps/pitty/rules.mk b/keyboards/lets_split/keymaps/pitty/rules.mk
index 8ebc85a44b..53a426157e 100644
--- a/keyboards/lets_split/keymaps/pitty/rules.mk
+++ b/keyboards/lets_split/keymaps/pitty/rules.mk
@@ -1,6 +1,3 @@
RGBLIGHT_ENABLE = yes
NKRO_ENABLE = yes
-ifndef QUANTUM_DIR
- include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/poker/rules.mk b/keyboards/lets_split/keymaps/poker/rules.mk
index 457a3d01d4..e69de29bb2 100644
--- a/keyboards/lets_split/keymaps/poker/rules.mk
+++ b/keyboards/lets_split/keymaps/poker/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
- include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/waples/rules.mk b/keyboards/lets_split/keymaps/waples/rules.mk
index 457a3d01d4..e69de29bb2 100644
--- a/keyboards/lets_split/keymaps/waples/rules.mk
+++ b/keyboards/lets_split/keymaps/waples/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
- include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/xk/rules.mk b/keyboards/lets_split/keymaps/xk/rules.mk
index 195f015778..8aafefa64f 100644
--- a/keyboards/lets_split/keymaps/xk/rules.mk
+++ b/keyboards/lets_split/keymaps/xk/rules.mk
@@ -14,6 +14,3 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
-ifndef QUANTUM_DIR
- include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/zer09/rules.mk b/keyboards/lets_split/keymaps/zer09/rules.mk
index d8adc70882..d2259fe9d5 100644
--- a/keyboards/lets_split/keymaps/zer09/rules.mk
+++ b/keyboards/lets_split/keymaps/zer09/rules.mk
@@ -1,6 +1,3 @@
RGBLIGHT_ENABLE = yes
TAP_DANCE_ENABLE = yes
-ifndef QUANTUM_DIR
- include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/sockets/config.h b/keyboards/lets_split/sockets/config.h
index 6939d37dc5..e73c45722d 100644
--- a/keyboards/lets_split/sockets/config.h
+++ b/keyboards/lets_split/sockets/config.h
@@ -85,3 +85,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
+
+#ifdef USE_Link_Time_Optimization
+ // LTO has issues with macros (action_get_macro) and "functions" (fn_actions),
+ // so just disable them
+ #define NO_ACTION_MACRO
+ #define NO_ACTION_FUNCTION
+
+ #define DISABLE_LEADER
+#endif // USE_Link_Time_Optimization \ No newline at end of file
diff --git a/keyboards/lets_split/sockets/rules.mk b/keyboards/lets_split/sockets/rules.mk
index e14d18d8de..da04decf40 100644
--- a/keyboards/lets_split/sockets/rules.mk
+++ b/keyboards/lets_split/sockets/rules.mk
@@ -1,3 +1,5 @@
BACKLIGHT_ENABLE = no
AUDIO_ENABLE = yes
RGBLIGHT_ENABLE = yes #Don't enable this along with I2C
+
+EXTRAFLAGS += -flto -DUSE_Link_Time_Optimization