Merge commit '28203e909e83b1ac6becb45a3eadae23b190df32' into master-core-pull

[max/tmk_keyboard.git] / converter / ps2_usb / Makefile

diff --git a/converter/ps2_usb/Makefile b/converter/ps2_usb/Makefile
index f20039c6f07c9f70b8f2a896166700f227b63cd8..51b22256610aa238c9b89872d7cb83150c43862e 100644 (file)
--- a/converter/ps2_usb/Makefile
+++ b/converter/ps2_usb/Makefile
@@ -5,7 +5,7 @@
 TARGET = ps2_usb_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../../tmk_core
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -87,32 +87,19 @@ NKRO_ENABLE = yes   # USB Nkey Rollover - not yet supported in LUFA
 
 # PS/2 Options
 #
-PS2_USE_USART = yes    # uses hardware USART engine for PS/2 signal receive(recomened)
-#PS2_USE_INT = yes     # uses external interrupt for falling edge of PS/2 clock pin
+#PS2_USE_USART = yes   # uses hardware USART engine for PS/2 signal receive(recomened)
+PS2_USE_INT = yes      # uses external interrupt for falling edge of PS/2 clock pin
 #PS2_USE_BUSYWAIT = yes        # uses primitive reference code
 
-# Serial Mouse Options
-#   You can choose a mouse protocol and the implementation of
-#   the underlying serial connection.
-#
-#SERIAL_MOUSE_MICROSOFT_ENABLE = yes   # Enable support for Microsoft-compatible mice
-#SERIAL_MOUSE_MOUSESYSTEMS_ENABLE = yes        # Enable support for Mousesystems-compatible mice
-#SERIAL_MOUSE_USE_UART = yes           # use hardware UART for serial connection
-#SERIAL_MOUSE_USE_SOFT = yes           # use software serial implementation
-
-# Optional serial mouse driver features
-# Support scrolling while holding the middle mouse button
-# (currently only supported for Mousesystems mice):
-#OPT_DEFS += -DSERIAL_MOUSE_CENTER_SCROLL
 
 # Optimize size but this may cause error "relocation truncated to fit"
 #EXTRALDFLAGS = -Wl,--relax
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk