X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=build_test.mk;h=ee15a45726466583eb18ab3e7d70f4fcec9176b3;hb=ed9c18e86650496627e3a94c29c370e76a6e8313;hp=dac59a8f48d434b171ab7873b1a57c844e51725e;hpb=8a9aac6e3237a505682cc7249a8dfff6cb964343;p=qmk_firmware.git

diff --git a/build_test.mk b/build_test.mk
index dac59a8f4..ee15a4572 100644
--- a/build_test.mk
+++ b/build_test.mk
@@ -10,7 +10,9 @@ TARGET=test/$(TEST)
 
 GTEST_OUTPUT = $(BUILD_DIR)/gtest
 
-OUTPUTS := $(GTEST_OUTPUT)
+TEST_OBJ = $(BUILD_DIR)/test_obj
+
+OUTPUTS := $(TEST_OBJ)/$(TEST) $(GTEST_OUTPUT)
 
 GTEST_INC := \
 	$(LIB_PATH)/googletest/googletest/include\
@@ -29,6 +31,7 @@ $(GTEST_OUTPUT)_DEFS :=
 $(GTEST_OUTPUT)_INC := $(GTEST_INC) $(GTEST_INTERNAL_INC)
 
 LDFLAGS += -lstdc++ -lpthread -shared-libgcc
+CREATE_MAP := no
 
 VPATH +=\
 	$(LIB_PATH)/googletest\
@@ -36,8 +39,19 @@ VPATH +=\
 
 all: elf
 
+VPATH += $(COMMON_VPATH)
+
+include $(TMK_PATH)/common.mk
+include $(QUANTUM_PATH)/serial_link/tests/rules.mk
+
+$(TEST_OBJ)/$(TEST)_SRC := $($(TEST)_SRC)
+$(TEST_OBJ)/$(TEST)_INC := $($(TEST)_INC) $(VPATH) $(GTEST_INC)
+$(TEST_OBJ)/$(TEST)_DEFS := $($(TEST)_DEFS)
+
 include $(TMK_PATH)/native.mk
 include $(TMK_PATH)/rules.mk
 
-$(shell mkdir $(BUILD_DIR)/test 2>/dev/null)
+
+$(shell mkdir -p $(BUILD_DIR)/test 2>/dev/null)
+$(shell mkdir -p $(TEST_OBJ) 2>/dev/null)